From b7aa171d58b96fe0c22a8955514fe4c7eaee95c4 Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Wed, 18 Feb 2015 12:05:35 +0100 Subject: [PATCH 01/10] Fix the toolbar JS for IE - fix the binding of listeners on XMLHttpRequest to always use the addEventListener method. It does not make sense to change it to attachEvent as it is about binding listeners on DOM elements. - fix the feature detection for the event binding on DOM elements: - the attachEvent and addEventListener methods are on DOM elements, not on the document object - the standard method should be preferred in IE versions supporting both methods - avoid JS errors when XMLHttpRequest is not defined by avoiding to override its open method when the object is not there (old IE versions will still not intercept ajax calls though) --- .../views/Profiler/base_js.html.twig | 59 ++++++++++--------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig index b21c515c92..2d0a56e668 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig @@ -173,7 +173,8 @@ var addEventListener; - if (document.attachEvent) { + var el = document.createElement('div'); + if (!'addEventListener' in el) { addEventListener = function (element, eventName, callback) { element.attachEvent('on' + eventName, callback); }; @@ -184,40 +185,42 @@ } {% if excluded_ajax_paths is defined %} - var proxied = XMLHttpRequest.prototype.open; + if (window.XMLHttpRequest) { + var proxied = XMLHttpRequest.prototype.open; - XMLHttpRequest.prototype.open = function(method, url, async, user, pass) { - var self = this; + XMLHttpRequest.prototype.open = function(method, url, async, user, pass) { + var self = this; - /* prevent logging AJAX calls to static and inline files, like templates */ - if (url.substr(0, 1) === '/' && !url.match(new RegExp("{{ excluded_ajax_paths }}"))) { - var stackElement = { - loading: true, - error: false, - url: url, - method: method, - start: new Date() - }; + /* prevent logging AJAX calls to static and inline files, like templates */ + if (url.substr(0, 1) === '/' && !url.match(new RegExp("{{ excluded_ajax_paths }}"))) { + var stackElement = { + loading: true, + error: false, + url: url, + method: method, + start: new Date() + }; - requestStack.push(stackElement); + requestStack.push(stackElement); - addEventListener(this, 'readystatechange', function() { - if (self.readyState == 4) { - stackElement.duration = new Date() - stackElement.start; - stackElement.loading = false; - stackElement.error = self.status < 200 || self.status >= 400; - stackElement.profile = self.getResponseHeader("X-Debug-Token"); - stackElement.profilerUrl = self.getResponseHeader("X-Debug-Token-Link"); + this.addEventListener('readystatechange', function() { + if (self.readyState == 4) { + stackElement.duration = new Date() - stackElement.start; + stackElement.loading = false; + stackElement.error = self.status < 200 || self.status >= 400; + stackElement.profile = self.getResponseHeader("X-Debug-Token"); + stackElement.profilerUrl = self.getResponseHeader("X-Debug-Token-Link"); - Sfjs.renderAjaxRequests(); - } - }); + Sfjs.renderAjaxRequests(); + } + }, false); - Sfjs.renderAjaxRequests(); - } + Sfjs.renderAjaxRequests(); + } - proxied.apply(this, Array.prototype.slice.call(arguments)); - }; + proxied.apply(this, Array.prototype.slice.call(arguments)); + }; + } {% endif %} return { From 3032014fd9d82cc8e91537f48a25ddadba12b2b4 Mon Sep 17 00:00:00 2001 From: WouterJ Date: Tue, 17 Feb 2015 13:48:44 +0100 Subject: [PATCH 02/10] Enforce UTF-8 charset for core controllers --- .../Controller/ExceptionController.php | 4 +- .../Controller/ExceptionControllerTest.php | 3 +- .../Controller/ExceptionController.php | 19 ++-- .../Controller/ProfilerController.php | 104 +++++++++++------- .../Controller/RouterController.php | 14 ++- .../Controller/ProfilerControllerTest.php | 1 + 6 files changed, 88 insertions(+), 57 deletions(-) diff --git a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php index 9f1edad12c..39d4aee102 100644 --- a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php +++ b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php @@ -51,7 +51,7 @@ class ExceptionController $code = $exception->getStatusCode(); - return new Response($this->twig->render( + return Response::create($this->twig->render( (string) $this->findTemplate($request, $request->getRequestFormat(), $code, $this->debug), array( 'status_code' => $code, @@ -60,7 +60,7 @@ class ExceptionController 'logger' => $logger, 'currentContent' => $currentContent, ) - )); + ))->setCharset('UTF-8'); } /** diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php index 20646f74aa..6cdb02f99d 100644 --- a/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php +++ b/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php @@ -39,6 +39,7 @@ class ExceptionControllerTest extends TestCase $request->headers->set('X-Php-Ob-Level', 1); $controller = new ExceptionController($twig, false); - $controller->showAction($request, $flatten); + $response = $controller->showAction($request, $flatten); + $this->assertEquals('UTF-8', $response->getCharset(), 'Request charset is explicitly set to UTF-8'); } } diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php index 0b5db752ee..abd75d440e 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php @@ -62,16 +62,17 @@ class ExceptionController $code = $exception->getStatusCode(); - return new Response($this->twig->render( - $template, - array( + return Response::create( + $this->twig->render($template, array( 'status_code' => $code, 'status_text' => Response::$statusTexts[$code], 'exception' => $exception, 'logger' => null, 'currentContent' => '', - ) - ), 200, array('Content-Type' => 'text/html')); + )), + 200, + array('Content-Type' => 'text/html') + )->setCharset('UTF-8'); } /** @@ -97,10 +98,14 @@ class ExceptionController if (!$this->templateExists($template)) { $handler = new ExceptionHandler(); - return new Response($handler->getStylesheet($exception), 200, array('Content-Type' => 'text/css')); + $response = new Response($handler->getStylesheet($exception), 200, array('Content-Type' => 'text/css')); + } else { + $response = new Response($this->twig->render('@WebProfiler/Collector/exception.css.twig'), 200, array('Content-Type' => 'text/css')); } - return new Response($this->twig->render('@WebProfiler/Collector/exception.css.twig'), 200, array('Content-Type' => 'text/css')); + $response->setCharset('UTF-8'); + + return $response; } protected function getTemplate() diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php index 173616fd9f..2c0d7a795e 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php @@ -99,16 +99,20 @@ class ProfilerController throw new NotFoundHttpException(sprintf('Panel "%s" is not available for token "%s".', $panel, $token)); } - return new Response($this->twig->render($this->getTemplateManager()->getName($profile, $panel), array( - 'token' => $token, - 'profile' => $profile, - 'collector' => $profile->getCollector($panel), - 'panel' => $panel, - 'page' => $page, - 'request' => $request, - 'templates' => $this->getTemplateManager()->getTemplates($profile), - 'is_ajax' => $request->isXmlHttpRequest(), - )), 200, array('Content-Type' => 'text/html')); + return Response::create( + $this->twig->render($this->getTemplateManager()->getName($profile, $panel), array( + 'token' => $token, + 'profile' => $profile, + 'collector' => $profile->getCollector($panel), + 'panel' => $panel, + 'page' => $page, + 'request' => $request, + 'templates' => $this->getTemplateManager()->getTemplates($profile), + 'is_ajax' => $request->isXmlHttpRequest(), + )), + 200, + array('Content-Type' => 'text/html') + )->setCharset('UTF-8'); } /** @@ -147,9 +151,13 @@ class ProfilerController $this->profiler->disable(); - return new Response($this->twig->render('@WebProfiler/Profiler/info.html.twig', array( - 'about' => $about, - )), 200, array('Content-Type' => 'text/html')); + return Response::create( + $this->twig->render('@WebProfiler/Profiler/info.html.twig', array( + 'about' => $about, + )), + 200, + array('Content-Type' => 'text/html') + )->setCharset('UTF-8'); } /** @@ -197,13 +205,17 @@ class ProfilerController // the profiler is not enabled } - return new Response($this->twig->render('@WebProfiler/Profiler/toolbar.html.twig', array( - 'position' => $position, - 'profile' => $profile, - 'templates' => $this->getTemplateManager()->getTemplates($profile), - 'profiler_url' => $url, - 'token' => $token, - )), 200, array('Content-Type' => 'text/html')); + return Response::create( + $this->twig->render('@WebProfiler/Profiler/toolbar.html.twig', array( + 'position' => $position, + 'profile' => $profile, + 'templates' => $this->getTemplateManager()->getTemplates($profile), + 'profiler_url' => $url, + 'token' => $token, + )), + 200, + array('Content-Type' => 'text/html') + )->setCharset('UTF-8'); } /** @@ -241,15 +253,19 @@ class ProfilerController $token = $session->get('_profiler_search_token'); } - return new Response($this->twig->render('@WebProfiler/Profiler/search.html.twig', array( - 'token' => $token, - 'ip' => $ip, - 'method' => $method, - 'url' => $url, - 'start' => $start, - 'end' => $end, - 'limit' => $limit, - )), 200, array('Content-Type' => 'text/html')); + return Response::create( + $this->twig->render('@WebProfiler/Profiler/search.html.twig', array( + 'token' => $token, + 'ip' => $ip, + 'method' => $method, + 'url' => $url, + 'start' => $start, + 'end' => $end, + 'limit' => $limit, + )), + 200, + array('Content-Type' => 'text/html') + )->setCharset('UTF-8'); } /** @@ -279,18 +295,22 @@ class ProfilerController $end = $request->query->get('end', null); $limit = $request->query->get('limit'); - return new Response($this->twig->render('@WebProfiler/Profiler/results.html.twig', array( - 'token' => $token, - 'profile' => $profile, - 'tokens' => $this->profiler->find($ip, $url, $limit, $method, $start, $end), - 'ip' => $ip, - 'method' => $method, - 'url' => $url, - 'start' => $start, - 'end' => $end, - 'limit' => $limit, - 'panel' => null, - )), 200, array('Content-Type' => 'text/html')); + return Response::create( + $this->twig->render('@WebProfiler/Profiler/results.html.twig', array( + 'token' => $token, + 'profile' => $profile, + 'tokens' => $this->profiler->find($ip, $url, $limit, $method, $start, $end), + 'ip' => $ip, + 'method' => $method, + 'url' => $url, + 'start' => $start, + 'end' => $end, + 'limit' => $limit, + 'panel' => null, + )), + 200, + array('Content-Type' => 'text/html') + )->setCharset('UTF-8'); } /** @@ -364,7 +384,7 @@ class ProfilerController phpinfo(); $phpinfo = ob_get_clean(); - return new Response($phpinfo, 200, array('Content-Type' => 'text/html')); + return Response::create($phpinfo, 200, array('Content-Type' => 'text/html'))->setCharset('UTF-8'); } /** diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php index f4a84bf568..800f209a6f 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/RouterController.php @@ -68,10 +68,14 @@ class RouterController $request = $profile->getCollector('request'); - return new Response($this->twig->render('@WebProfiler/Router/panel.html.twig', array( - 'request' => $request, - 'router' => $profile->getCollector('router'), - 'traces' => $matcher->getTraces($request->getPathInfo()), - )), 200, array('Content-Type' => 'text/html')); + return Response::create( + $this->twig->render('@WebProfiler/Router/panel.html.twig', array( + 'request' => $request, + 'router' => $profile->getCollector('router'), + 'traces' => $matcher->getTraces($request->getPathInfo()), + )), + 200, + array('Content-Type' => 'text/html') + )->setCharset('UTF-8'); } } diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php index c10449d323..3338d8c53b 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php @@ -69,6 +69,7 @@ class ProfilerControllerTest extends \PHPUnit_Framework_TestCase $response = $controller->toolbarAction(Request::create('/_wdt/found'), 'found'); $this->assertEquals(200, $response->getStatusCode()); + $this->assertEquals('UTF-8', $response->getCharset(), 'Request charset is explicitly set to UTF-8'); $response = $controller->toolbarAction(Request::create('/_wdt/notFound'), 'notFound'); $this->assertEquals(404, $response->getStatusCode()); From d1c8c5d22f99d23f1e9c9ff60d8baea355db9c27 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Sat, 21 Feb 2015 16:36:02 +0100 Subject: [PATCH 03/10] [PropertyAccess] unify and fix doc --- .../PropertyAccess/PropertyAccessor.php | 14 ++++++++------ .../PropertyAccessorBuilder.php | 19 ++++++++++++------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php index a52e8ebdea..cef1c6e7f5 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php +++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php @@ -200,8 +200,9 @@ class PropertyAccessor implements PropertyAccessorInterface if (!is_array($objectOrArray)) { if (!$objectOrArray instanceof \Traversable) { throw new NoSuchIndexException(sprintf( - 'Cannot read property "%s".', - $property + 'Cannot read index "%s" while trying to traverse path "%s".', + $property, + (string) $propertyPath )); } @@ -209,8 +210,9 @@ class PropertyAccessor implements PropertyAccessorInterface } throw new NoSuchIndexException(sprintf( - 'Cannot read property "%s". Available properties are "%s"', + 'Cannot read index "%s" while trying to traverse path "%s". Available indices are "%s".', $property, + (string) $propertyPath, print_r(array_keys($objectOrArray), true) )); } @@ -250,7 +252,7 @@ class PropertyAccessor implements PropertyAccessorInterface private function &readIndex(&$array, $index) { if (!$array instanceof \ArrayAccess && !is_array($array)) { - throw new NoSuchIndexException(sprintf('Index "%s" cannot be read from object of type "%s" because it doesn\'t implement \ArrayAccess', $index, get_class($array))); + throw new NoSuchIndexException(sprintf('Cannot read index "%s" from object of type "%s" because it doesn\'t implement \ArrayAccess.', $index, get_class($array))); } // Use an array instead of an object since performance is very crucial here @@ -294,7 +296,7 @@ class PropertyAccessor implements PropertyAccessorInterface ); if (!is_object($object)) { - throw new NoSuchPropertyException(sprintf('Cannot read property "%s" from an array. Maybe you should write the property path as "[%s]" instead?', $property, $property)); + throw new NoSuchPropertyException(sprintf('Cannot read property "%s" from an array. Maybe you intended to write the property path as "[%s]" instead.', $property, $property)); } $camelized = $this->camelize($property); @@ -364,7 +366,7 @@ class PropertyAccessor implements PropertyAccessorInterface private function writeIndex(&$array, $index, $value) { if (!$array instanceof \ArrayAccess && !is_array($array)) { - throw new NoSuchIndexException(sprintf('Index "%s" cannot be modified in object of type "%s" because it doesn\'t implement \ArrayAccess', $index, get_class($array))); + throw new NoSuchIndexException(sprintf('Cannot modify index "%s" in object of type "%s" because it doesn\'t implement \ArrayAccess', $index, get_class($array))); } $array[$index] = $value; diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php b/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php index 738e5062fd..fc8ac4ed2d 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php +++ b/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php @@ -12,7 +12,7 @@ namespace Symfony\Component\PropertyAccess; /** - * A configurable builder for PropertyAccessorInterface objects. + * A configurable builder to create a PropertyAccessor. * * @author Jérémie Augustin */ @@ -53,7 +53,7 @@ class PropertyAccessorBuilder } /** - * @return bool true if the use of "__call" by the PropertyAccessor is enabled + * @return bool whether the use of "__call" by the PropertyAccessor is enabled */ public function isMagicCallEnabled() { @@ -61,7 +61,10 @@ class PropertyAccessorBuilder } /** - * Enables exceptions in read context for array by PropertyAccessor + * Enables exceptions when reading a non-existing index. + * + * This has no influence on writing non-existing indices with PropertyAccessorInterface::setValue() + * which are always created on-the-fly. * * @return PropertyAccessorBuilder The builder object */ @@ -73,7 +76,9 @@ class PropertyAccessorBuilder } /** - * Disables exceptions in read context for array by PropertyAccessor + * Disables exceptions when reading a non-existing index. + * + * Instead, null is returned when calling PropertyAccessorInterface::getValue() on a non-existing index. * * @return PropertyAccessorBuilder The builder object */ @@ -85,7 +90,7 @@ class PropertyAccessorBuilder } /** - * @return bool true is exceptions in read context for array is enabled + * @return bool whether an exception is thrown or null is returned when reading a non-existing index */ public function isExceptionOnInvalidIndexEnabled() { @@ -93,9 +98,9 @@ class PropertyAccessorBuilder } /** - * Builds and returns a new propertyAccessor object. + * Builds and returns a new PropertyAccessor object. * - * @return PropertyAccessorInterface The built propertyAccessor + * @return PropertyAccessorInterface The built PropertyAccessor */ public function getPropertyAccessor() { From 11b2a9bfdeb8575f550a0493ed80333ec55bd9a7 Mon Sep 17 00:00:00 2001 From: Arnaud Kleinpeter Date: Sat, 21 Feb 2015 18:00:45 +0100 Subject: [PATCH 04/10] [Console] explicit assertion for ArgvInput::getFirstArgument() with no arguments --- src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php b/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php index bdbe3543b8..d2c540e6fe 100644 --- a/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php +++ b/src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php @@ -257,7 +257,7 @@ class ArgvInputTest extends \PHPUnit_Framework_TestCase public function testGetFirstArgument() { $input = new ArgvInput(array('cli.php', '-fbbar')); - $this->assertEquals('', $input->getFirstArgument(), '->getFirstArgument() returns the first argument from the raw input'); + $this->assertNull($input->getFirstArgument(), '->getFirstArgument() returns null when there is no arguments'); $input = new ArgvInput(array('cli.php', '-fbbar', 'foo')); $this->assertEquals('foo', $input->getFirstArgument(), '->getFirstArgument() returns the first argument from the raw input'); From d0f1d3236c7263a209d3da7c6ae04d13869b4a49 Mon Sep 17 00:00:00 2001 From: Francis Besset Date: Wed, 18 Feb 2015 15:48:31 +0100 Subject: [PATCH 05/10] [2.3][Process] Fixed PhpProcess::getCommandLine() result --- src/Symfony/Component/Process/PhpProcess.php | 14 ++++++------- .../Process/Tests/PhpProcessTest.php | 20 +++++++++++++++++++ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/Symfony/Component/Process/PhpProcess.php b/src/Symfony/Component/Process/PhpProcess.php index bc25154a8e..6a5858748a 100644 --- a/src/Symfony/Component/Process/PhpProcess.php +++ b/src/Symfony/Component/Process/PhpProcess.php @@ -26,8 +26,6 @@ use Symfony\Component\Process\Exception\RuntimeException; */ class PhpProcess extends Process { - private $executableFinder; - /** * Constructor. * @@ -41,9 +39,12 @@ class PhpProcess extends Process */ public function __construct($script, $cwd = null, array $env = array(), $timeout = 60, array $options = array()) { - parent::__construct(null, $cwd, $env, $script, $timeout, $options); + $executableFinder = new PhpExecutableFinder(); + if (false === $php = $executableFinder->find()) { + $php = null; + } - $this->executableFinder = new PhpExecutableFinder(); + parent::__construct($php, $cwd, $env, $script, $timeout, $options); } /** @@ -62,10 +63,7 @@ class PhpProcess extends Process public function start($callback = null) { if (null === $this->getCommandLine()) { - if (false === $php = $this->executableFinder->find()) { - throw new RuntimeException('Unable to find the PHP executable.'); - } - $this->setCommandLine($php); + throw new RuntimeException('Unable to find the PHP executable.'); } parent::start($callback); diff --git a/src/Symfony/Component/Process/Tests/PhpProcessTest.php b/src/Symfony/Component/Process/Tests/PhpProcessTest.php index df66ad624b..5dc546cc1c 100644 --- a/src/Symfony/Component/Process/Tests/PhpProcessTest.php +++ b/src/Symfony/Component/Process/Tests/PhpProcessTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Process\Tests; +use Symfony\Component\Process\PhpExecutableFinder; use Symfony\Component\Process\PhpProcess; class PhpProcessTest extends \PHPUnit_Framework_TestCase @@ -26,4 +27,23 @@ PHP $process->wait(); $this->assertEquals($expected, $process->getOutput()); } + + public function testCommandLine() + { + $process = new PhpProcess(<<find(); + + $this->assertSame($commandLine, $process->getCommandLine(), '::getCommandLine() returns the command line of PHP before start'); + + $process->start(); + $this->assertSame($commandLine, $process->getCommandLine(), '::getCommandLine() returns the command line of PHP after start'); + + $process->wait(); + $this->assertSame($commandLine, $process->getCommandLine(), '::getCommandLine() returns the command line of PHP after wait'); + } } From 6726a40654b112c815efb7a8788d1cfa50dffd34 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 24 Feb 2015 09:16:05 +0100 Subject: [PATCH 06/10] [2.3] Update CONTRIBUTING.md --- CONTRIBUTING.md | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 79cc6756b9..4def05128a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,11 +1,33 @@ Contributing ------------ -Symfony is an open source, community-driven project. If you'd like to contribute, -please read the [Contributing Code][1] part of the documentation. If you're submitting -a pull request, please follow the guidelines in the [Submitting a Patch][2] section -and use the [Pull Request Template][3]. +Symfony is an open source, community-driven project. + +If you'd like to contribute, please read the following documents: + +* [Contributing Code][1]: The document index related to contributions; + +* [Submitting a Patch][2]: Guidelines for submitting a pull request; + +* [Pull Request Template][3]: Template header to use in your pull request + description; + +```markdown +| Q | A +| ------------- | --- +| Bug fix? | yes/no +| New feature? | yes/no +| BC breaks? | no +| Deprecations? | no +| Tests pass? | yes +| Fixed tickets | #1234 +| License | MIT +| Doc PR | symfony/symfony-docs#1234 +``` + +* [Backwards Compatibility][4]: Backward compatibility rules. [1]: http://symfony.com/doc/current/contributing/code/index.html [2]: http://symfony.com/doc/current/contributing/code/patches.html#check-list [3]: http://symfony.com/doc/current/contributing/code/patches.html#make-a-pull-request +[4]: http://symfony.com/doc/current/contributing/code/bc.html#working-on-symfony-code From d7f008d6927d47c225e2083a422d8f36cfa4380d Mon Sep 17 00:00:00 2001 From: Francis Besset Date: Tue, 24 Feb 2015 10:38:28 +0100 Subject: [PATCH 07/10] [FrameworkBundle] Fixed Shell logo --- src/Symfony/Bundle/FrameworkBundle/Console/Shell.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Shell.php b/src/Symfony/Bundle/FrameworkBundle/Console/Shell.php index 33100bdaca..80daebd4cd 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Shell.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Shell.php @@ -29,12 +29,12 @@ class Shell extends BaseShell { return << - _____ __ ___ - / ____| / _| |__ \ - | (___ _ _ _ __ ___ | |_ ___ _ __ _ _ ) | - \___ \| | | | '_ ` _ \| _/ _ \| '_ \| | | | / / - ____) | |_| | | | | | | || (_) | | | | |_| |/ /_ - |_____/ \__, |_| |_| |_|_| \___/|_| |_|\__, |____| + _____ __ + / ____| / _| + | (___ _ _ _ __ ___ | |_ ___ _ __ _ _ + \___ \| | | | '_ ` _ \| _/ _ \| '_ \| | | | + ____) | |_| | | | | | | || (_) | | | | |_| | + |_____/ \__, |_| |_| |_|_| \___/|_| |_|\__, | __/ | __/ | |___/ |___/ From 8b02796e9ed90ae3b1bbf925ffde484d80941874 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 24 Feb 2015 09:06:17 +0100 Subject: [PATCH 08/10] [2.3] require-dev PHPUnit bridge --- .travis.yml | 17 +++++++++-------- autoload.php.dist | 15 --------------- composer.json | 1 + phpunit.xml.dist | 9 +++++---- src/Symfony/Bridge/Doctrine/Tests/bootstrap.php | 14 -------------- src/Symfony/Bridge/Doctrine/composer.json | 1 + src/Symfony/Bridge/Doctrine/phpunit.xml.dist | 5 ++--- src/Symfony/Bridge/Monolog/composer.json | 3 +++ src/Symfony/Bridge/Monolog/phpunit.xml.dist | 3 +-- src/Symfony/Bridge/Propel1/composer.json | 1 + src/Symfony/Bridge/Propel1/phpunit.xml.dist | 3 +-- src/Symfony/Bridge/ProxyManager/composer.json | 1 + .../Bridge/ProxyManager/phpunit.xml.dist | 3 +-- src/Symfony/Bridge/Swiftmailer/composer.json | 3 +++ src/Symfony/Bridge/Twig/composer.json | 1 + src/Symfony/Bridge/Twig/phpunit.xml.dist | 3 +-- .../Bundle/FrameworkBundle/composer.json | 1 + .../Bundle/FrameworkBundle/phpunit.xml.dist | 3 +-- src/Symfony/Bundle/SecurityBundle/composer.json | 1 + .../Bundle/SecurityBundle/phpunit.xml.dist | 3 +-- src/Symfony/Bundle/TwigBundle/composer.json | 1 + src/Symfony/Bundle/TwigBundle/phpunit.xml.dist | 3 +-- .../Bundle/WebProfilerBundle/composer.json | 1 + .../Bundle/WebProfilerBundle/phpunit.xml.dist | 3 +-- src/Symfony/Component/BrowserKit/composer.json | 1 + .../Component/BrowserKit/phpunit.xml.dist | 3 +-- src/Symfony/Component/ClassLoader/composer.json | 1 + .../Component/ClassLoader/phpunit.xml.dist | 3 +-- src/Symfony/Component/Config/composer.json | 3 +++ src/Symfony/Component/Config/phpunit.xml.dist | 3 +-- src/Symfony/Component/Console/composer.json | 1 + src/Symfony/Component/Console/phpunit.xml.dist | 3 +-- src/Symfony/Component/CssSelector/composer.json | 3 +++ .../Component/CssSelector/phpunit.xml.dist | 3 +-- src/Symfony/Component/Debug/composer.json | 1 + src/Symfony/Component/Debug/phpunit.xml.dist | 3 +-- .../Component/DependencyInjection/composer.json | 1 + .../DependencyInjection/phpunit.xml.dist | 3 +-- src/Symfony/Component/DomCrawler/composer.json | 1 + .../Component/DomCrawler/phpunit.xml.dist | 3 +-- .../Component/EventDispatcher/composer.json | 1 + .../Component/EventDispatcher/phpunit.xml.dist | 3 +-- src/Symfony/Component/Filesystem/composer.json | 3 +++ .../Component/Filesystem/phpunit.xml.dist | 3 +-- src/Symfony/Component/Finder/composer.json | 3 +++ src/Symfony/Component/Finder/phpunit.xml.dist | 3 +-- src/Symfony/Component/Form/composer.json | 1 + src/Symfony/Component/Form/phpunit.xml.dist | 3 +-- .../Component/HttpFoundation/composer.json | 3 +++ .../Component/HttpFoundation/phpunit.xml.dist | 3 +-- src/Symfony/Component/HttpKernel/Client.php | 2 +- src/Symfony/Component/HttpKernel/composer.json | 1 + .../Component/HttpKernel/phpunit.xml.dist | 3 +-- src/Symfony/Component/Intl/composer.json | 1 + src/Symfony/Component/Intl/phpunit.xml.dist | 3 +-- src/Symfony/Component/Locale/composer.json | 3 +++ src/Symfony/Component/Locale/phpunit.xml.dist | 3 +-- .../Component/OptionsResolver/composer.json | 3 +++ .../Component/OptionsResolver/phpunit.xml.dist | 3 +-- src/Symfony/Component/Process/composer.json | 3 +++ src/Symfony/Component/Process/phpunit.xml.dist | 3 +-- .../Component/PropertyAccess/composer.json | 3 +++ .../Component/PropertyAccess/phpunit.xml.dist | 3 +-- src/Symfony/Component/Routing/composer.json | 1 + src/Symfony/Component/Routing/phpunit.xml.dist | 3 +-- src/Symfony/Component/Security/composer.json | 1 + src/Symfony/Component/Security/phpunit.xml.dist | 3 +-- src/Symfony/Component/Serializer/composer.json | 3 +++ .../Component/Serializer/phpunit.xml.dist | 3 +-- src/Symfony/Component/Stopwatch/composer.json | 3 +++ .../Component/Stopwatch/phpunit.xml.dist | 3 +-- src/Symfony/Component/Templating/composer.json | 3 +++ .../Component/Templating/phpunit.xml.dist | 4 ++-- src/Symfony/Component/Translation/composer.json | 1 + .../Component/Translation/phpunit.xml.dist | 4 ++-- .../Component/Validator/Tests/bootstrap.php | 14 -------------- src/Symfony/Component/Validator/composer.json | 1 + .../Component/Validator/phpunit.xml.dist | 6 +++--- src/Symfony/Component/Yaml/composer.json | 3 +++ src/Symfony/Component/Yaml/phpunit.xml.dist | 3 +-- 80 files changed, 124 insertions(+), 130 deletions(-) delete mode 100644 autoload.php.dist delete mode 100644 src/Symfony/Bridge/Doctrine/Tests/bootstrap.php delete mode 100644 src/Symfony/Component/Validator/Tests/bootstrap.php diff --git a/.travis.yml b/.travis.yml index eba78dcddf..a97b93102e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,9 @@ matrix: - php: 5.5 - php: 5.6 - php: 5.3 - env: components=low + env: deps=low - php: 5.6 - env: components=high + env: deps=high - php: hhvm-nightly allow_failures: - php: hhvm-nightly @@ -20,7 +20,8 @@ services: mongodb env: global: - - components=no + - deps=no + - SYMFONY_DEPRECATIONS_HELPER=weak before_install: - travis_retry sudo apt-get install parallel @@ -36,10 +37,10 @@ before_install: - if [ "$TRAVIS_BRANCH" = "master" ]; then export COMPOSER_ROOT_VERSION=dev-master; else export COMPOSER_ROOT_VERSION="$TRAVIS_BRANCH".x-dev; fi; install: - - if [ "$components" = "no" ]; then composer --prefer-source install; fi; + - if [ "$deps" = "no" ]; then composer --prefer-source install; fi; script: - - if [ "$components" = "no" ]; then ls -d src/Symfony/*/* | parallel --gnu --keep-order 'echo -e "\\nRunning {} tests"; phpunit --exclude-group tty,benchmark,intl-data {} || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi; - - if [ "$components" = "no" ]; then echo -e "\\nRunning tests requiring tty"; phpunit --group tty || (echo -e "\\e[41mKO\\e[0m tty group" && $(exit 1)); fi; - - if [ "$components" = "high" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi; - - if [ "$components" = "low" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source --prefer-lowest --prefer-stable update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi; + - if [ "$deps" = "no" ]; then ls -d src/Symfony/*/* | parallel --gnu --keep-order 'echo -e "\\nRunning {} tests"; phpunit --exclude-group tty,benchmark,intl-data {} || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi; + - if [ "$deps" = "no" ]; then echo -e "\\nRunning tests requiring tty"; phpunit --group tty || (echo -e "\\e[41mKO\\e[0m tty group" && $(exit 1)); fi; + - if [ "$deps" = "high" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source update; phpunit --exclude-group tty,benchmark,intl-data,legacy || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi; + - if [ "$deps" = "low" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source --prefer-lowest --prefer-stable update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi; diff --git a/autoload.php.dist b/autoload.php.dist deleted file mode 100644 index 689f140d09..0000000000 --- a/autoload.php.dist +++ /dev/null @@ -1,15 +0,0 @@ -= 50400 && gc_enabled()) { - // Disabling Zend Garbage Collection to prevent segfaults with PHP5.4+ - // https://bugs.php.net/bug.php?id=53976 - gc_disable(); -} - -$loader = require_once __DIR__.'/vendor/autoload.php'; - -use Doctrine\Common\Annotations\AnnotationRegistry; - -AnnotationRegistry::registerLoader(array($loader, 'loadClass')); - -return $loader; diff --git a/composer.json b/composer.json index 1174cb31b7..2ffab0c7f1 100644 --- a/composer.json +++ b/composer.json @@ -61,6 +61,7 @@ "symfony/yaml": "self.version" }, "require-dev": { + "symfony/phpunit-bridge": "~2.7", "doctrine/data-fixtures": "1.0.*", "doctrine/dbal": "~2.2", "doctrine/orm": "~2.2,>=2.2.3", diff --git a/phpunit.xml.dist b/phpunit.xml.dist index ce0621d0a9..e9c709d142 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -4,12 +4,13 @@ xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd" backupGlobals="false" colors="true" - bootstrap="autoload.php.dist" + bootstrap="vendor/autoload.php" > - - - + + + + diff --git a/src/Symfony/Bridge/Doctrine/Tests/bootstrap.php b/src/Symfony/Bridge/Doctrine/Tests/bootstrap.php deleted file mode 100644 index 7912352895..0000000000 --- a/src/Symfony/Bridge/Doctrine/Tests/bootstrap.php +++ /dev/null @@ -1,14 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -$loader = require __DIR__.'/../vendor/autoload.php'; - -Doctrine\Common\Annotations\AnnotationRegistry::registerLoader(array($loader, 'loadClass')); diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 9ae21d4ab3..a0b488ea03 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -20,6 +20,7 @@ "doctrine/common": "~2.3" }, "require-dev": { + "symfony/phpunit-bridge": "~2.7", "symfony/stopwatch": "~2.2", "symfony/dependency-injection": "~2.0,>=2.0.5", "symfony/form": "~2.3,>=2.3.8", diff --git a/src/Symfony/Bridge/Doctrine/phpunit.xml.dist b/src/Symfony/Bridge/Doctrine/phpunit.xml.dist index 5dfeedc2b1..13409e6f0f 100644 --- a/src/Symfony/Bridge/Doctrine/phpunit.xml.dist +++ b/src/Symfony/Bridge/Doctrine/phpunit.xml.dist @@ -4,11 +4,10 @@ xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd" backupGlobals="false" colors="true" - bootstrap="Tests/bootstrap.php" + bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Bridge/Monolog/composer.json b/src/Symfony/Bridge/Monolog/composer.json index 643bd9229a..4952059eaa 100644 --- a/src/Symfony/Bridge/Monolog/composer.json +++ b/src/Symfony/Bridge/Monolog/composer.json @@ -20,6 +20,9 @@ "symfony/http-kernel": "~2.2", "monolog/monolog": "~1.3" }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7" + }, "autoload": { "psr-0": { "Symfony\\Bridge\\Monolog\\": "" } }, diff --git a/src/Symfony/Bridge/Monolog/phpunit.xml.dist b/src/Symfony/Bridge/Monolog/phpunit.xml.dist index 528e310c88..efd48709de 100644 --- a/src/Symfony/Bridge/Monolog/phpunit.xml.dist +++ b/src/Symfony/Bridge/Monolog/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Bridge/Propel1/composer.json b/src/Symfony/Bridge/Propel1/composer.json index 69caa16de6..92eabf6a90 100644 --- a/src/Symfony/Bridge/Propel1/composer.json +++ b/src/Symfony/Bridge/Propel1/composer.json @@ -24,6 +24,7 @@ "propel/propel1": "~1.6,>=1.6.5" }, "require-dev": { + "symfony/phpunit-bridge": "~2.7", "symfony/stopwatch": "~2.2" }, "autoload": { diff --git a/src/Symfony/Bridge/Propel1/phpunit.xml.dist b/src/Symfony/Bridge/Propel1/phpunit.xml.dist index eca99132e4..507e12596c 100644 --- a/src/Symfony/Bridge/Propel1/phpunit.xml.dist +++ b/src/Symfony/Bridge/Propel1/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Bridge/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json index 9c61d2d98e..095eab6a33 100644 --- a/src/Symfony/Bridge/ProxyManager/composer.json +++ b/src/Symfony/Bridge/ProxyManager/composer.json @@ -21,6 +21,7 @@ "ocramius/proxy-manager": "~0.3.1" }, "require-dev": { + "symfony/phpunit-bridge": "~2.7", "symfony/config": "~2.3" }, "autoload": { diff --git a/src/Symfony/Bridge/ProxyManager/phpunit.xml.dist b/src/Symfony/Bridge/ProxyManager/phpunit.xml.dist index d55b9bfcfd..363805fdfa 100644 --- a/src/Symfony/Bridge/ProxyManager/phpunit.xml.dist +++ b/src/Symfony/Bridge/ProxyManager/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Bridge/Swiftmailer/composer.json b/src/Symfony/Bridge/Swiftmailer/composer.json index 7ad93ab97e..7d24a195db 100644 --- a/src/Symfony/Bridge/Swiftmailer/composer.json +++ b/src/Symfony/Bridge/Swiftmailer/composer.json @@ -19,6 +19,9 @@ "php": ">=5.3.3", "swiftmailer/swiftmailer": ">=4.2.0,<6.0-dev" }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7" + }, "suggest": { "symfony/http-kernel": "" }, diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 15ba7e416c..b0d5982be0 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -20,6 +20,7 @@ "twig/twig": "~1.12,>=1.12.3" }, "require-dev": { + "symfony/phpunit-bridge": "~2.7", "symfony/finder": "~2.3", "symfony/form": "~2.3.5", "symfony/http-kernel": "~2.3", diff --git a/src/Symfony/Bridge/Twig/phpunit.xml.dist b/src/Symfony/Bridge/Twig/phpunit.xml.dist index d74b960a60..d291324949 100644 --- a/src/Symfony/Bridge/Twig/phpunit.xml.dist +++ b/src/Symfony/Bridge/Twig/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 9bd4e7f6f9..98d2b491dc 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -30,6 +30,7 @@ "doctrine/common": "~2.2" }, "require-dev": { + "symfony/phpunit-bridge": "~2.7", "symfony/browser-kit": "~2.3", "symfony/console": "~2.3", "symfony/css-selector": "~2.0,>=2.0.5", diff --git a/src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist b/src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist index 30481767b2..eb7c0b0a97 100644 --- a/src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist +++ b/src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json index 89d45e27bf..cbc89dc11e 100644 --- a/src/Symfony/Bundle/SecurityBundle/composer.json +++ b/src/Symfony/Bundle/SecurityBundle/composer.json @@ -21,6 +21,7 @@ "symfony/http-kernel": "~2.2" }, "require-dev": { + "symfony/phpunit-bridge": "~2.7", "symfony/browser-kit": "~2.3", "symfony/css-selector": "~2.0,>=2.0.5", "symfony/dependency-injection": "~2.3", diff --git a/src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist b/src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist index 07e43b107d..52f420ae5f 100644 --- a/src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist +++ b/src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json index 2922a91b3f..0641d08b36 100644 --- a/src/Symfony/Bundle/TwigBundle/composer.json +++ b/src/Symfony/Bundle/TwigBundle/composer.json @@ -21,6 +21,7 @@ "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2" }, "require-dev": { + "symfony/phpunit-bridge": "~2.7", "symfony/stopwatch": "~2.2", "symfony/dependency-injection": "~2.2", "symfony/config": "~2.2", diff --git a/src/Symfony/Bundle/TwigBundle/phpunit.xml.dist b/src/Symfony/Bundle/TwigBundle/phpunit.xml.dist index 10d1ffa927..715b0bfa87 100644 --- a/src/Symfony/Bundle/TwigBundle/phpunit.xml.dist +++ b/src/Symfony/Bundle/TwigBundle/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json index 0dc5fb9659..0649de65b6 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/composer.json +++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json @@ -22,6 +22,7 @@ "symfony/twig-bridge": "~2.2" }, "require-dev": { + "symfony/phpunit-bridge": "~2.7", "symfony/config": "~2.2", "symfony/console": "~2.3", "symfony/dependency-injection": "~2.2", diff --git a/src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist b/src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist index 86602baa69..767f3e066b 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist +++ b/src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Component/BrowserKit/composer.json b/src/Symfony/Component/BrowserKit/composer.json index 2d7eacc9ca..46c82363cb 100644 --- a/src/Symfony/Component/BrowserKit/composer.json +++ b/src/Symfony/Component/BrowserKit/composer.json @@ -20,6 +20,7 @@ "symfony/dom-crawler": "~2.0,>=2.0.5" }, "require-dev": { + "symfony/phpunit-bridge": "~2.7", "symfony/process": "~2.0,>=2.0.5", "symfony/css-selector": "~2.0,>=2.0.5" }, diff --git a/src/Symfony/Component/BrowserKit/phpunit.xml.dist b/src/Symfony/Component/BrowserKit/phpunit.xml.dist index 78f8da9de6..d6ca28bf1c 100644 --- a/src/Symfony/Component/BrowserKit/phpunit.xml.dist +++ b/src/Symfony/Component/BrowserKit/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Component/ClassLoader/composer.json b/src/Symfony/Component/ClassLoader/composer.json index c2de59d667..ca66da278a 100644 --- a/src/Symfony/Component/ClassLoader/composer.json +++ b/src/Symfony/Component/ClassLoader/composer.json @@ -20,6 +20,7 @@ "php": ">=5.3.3" }, "require-dev": { + "symfony/phpunit-bridge": "~2.7", "symfony/finder": "~2.0,>=2.0.5" }, "autoload": { diff --git a/src/Symfony/Component/ClassLoader/phpunit.xml.dist b/src/Symfony/Component/ClassLoader/phpunit.xml.dist index 4495798930..a1b6c82c10 100644 --- a/src/Symfony/Component/ClassLoader/phpunit.xml.dist +++ b/src/Symfony/Component/ClassLoader/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Component/Config/composer.json b/src/Symfony/Component/Config/composer.json index 6e8967cf65..d089cd2b9a 100644 --- a/src/Symfony/Component/Config/composer.json +++ b/src/Symfony/Component/Config/composer.json @@ -19,6 +19,9 @@ "php": ">=5.3.3", "symfony/filesystem": "~2.3" }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7" + }, "autoload": { "psr-0": { "Symfony\\Component\\Config\\": "" } }, diff --git a/src/Symfony/Component/Config/phpunit.xml.dist b/src/Symfony/Component/Config/phpunit.xml.dist index 725692e253..2156534e9c 100644 --- a/src/Symfony/Component/Config/phpunit.xml.dist +++ b/src/Symfony/Component/Config/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json index 472b4f23c2..c92bb513fb 100644 --- a/src/Symfony/Component/Console/composer.json +++ b/src/Symfony/Component/Console/composer.json @@ -19,6 +19,7 @@ "php": ">=5.3.3" }, "require-dev": { + "symfony/phpunit-bridge": "~2.7", "symfony/event-dispatcher": "~2.1" }, "suggest": { diff --git a/src/Symfony/Component/Console/phpunit.xml.dist b/src/Symfony/Component/Console/phpunit.xml.dist index f4831ecb85..729c433aa6 100644 --- a/src/Symfony/Component/Console/phpunit.xml.dist +++ b/src/Symfony/Component/Console/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Component/CssSelector/composer.json b/src/Symfony/Component/CssSelector/composer.json index 12d8c8ee5f..300a51ffbc 100644 --- a/src/Symfony/Component/CssSelector/composer.json +++ b/src/Symfony/Component/CssSelector/composer.json @@ -22,6 +22,9 @@ "require": { "php": ">=5.3.3" }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7" + }, "autoload": { "psr-0": { "Symfony\\Component\\CssSelector\\": "" } }, diff --git a/src/Symfony/Component/CssSelector/phpunit.xml.dist b/src/Symfony/Component/CssSelector/phpunit.xml.dist index 7f88533151..bc57cfcdfa 100644 --- a/src/Symfony/Component/CssSelector/phpunit.xml.dist +++ b/src/Symfony/Component/CssSelector/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Component/Debug/composer.json b/src/Symfony/Component/Debug/composer.json index b0ce20c21b..a6a3e3be44 100644 --- a/src/Symfony/Component/Debug/composer.json +++ b/src/Symfony/Component/Debug/composer.json @@ -22,6 +22,7 @@ "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" }, "require-dev": { + "symfony/phpunit-bridge": "~2.7", "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2", "symfony/http-foundation": "~2.1" }, diff --git a/src/Symfony/Component/Debug/phpunit.xml.dist b/src/Symfony/Component/Debug/phpunit.xml.dist index 269ca991b7..e917660657 100644 --- a/src/Symfony/Component/Debug/phpunit.xml.dist +++ b/src/Symfony/Component/Debug/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json index a6ec0e1e76..6713a3f1f8 100644 --- a/src/Symfony/Component/DependencyInjection/composer.json +++ b/src/Symfony/Component/DependencyInjection/composer.json @@ -19,6 +19,7 @@ "php": ">=5.3.3" }, "require-dev": { + "symfony/phpunit-bridge": "~2.7", "symfony/yaml": "~2.1", "symfony/config": "~2.2" }, diff --git a/src/Symfony/Component/DependencyInjection/phpunit.xml.dist b/src/Symfony/Component/DependencyInjection/phpunit.xml.dist index 10e67fcebf..17a217226d 100644 --- a/src/Symfony/Component/DependencyInjection/phpunit.xml.dist +++ b/src/Symfony/Component/DependencyInjection/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Component/DomCrawler/composer.json b/src/Symfony/Component/DomCrawler/composer.json index ebee035bcb..fad8349172 100644 --- a/src/Symfony/Component/DomCrawler/composer.json +++ b/src/Symfony/Component/DomCrawler/composer.json @@ -19,6 +19,7 @@ "php": ">=5.3.3" }, "require-dev": { + "symfony/phpunit-bridge": "~2.7", "symfony/css-selector": "~2.0,>=2.0.5" }, "suggest": { diff --git a/src/Symfony/Component/DomCrawler/phpunit.xml.dist b/src/Symfony/Component/DomCrawler/phpunit.xml.dist index 5ce15ec602..d15dd6a48e 100644 --- a/src/Symfony/Component/DomCrawler/phpunit.xml.dist +++ b/src/Symfony/Component/DomCrawler/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Component/EventDispatcher/composer.json b/src/Symfony/Component/EventDispatcher/composer.json index 99a0e51d1b..91636be359 100644 --- a/src/Symfony/Component/EventDispatcher/composer.json +++ b/src/Symfony/Component/EventDispatcher/composer.json @@ -19,6 +19,7 @@ "php": ">=5.3.3" }, "require-dev": { + "symfony/phpunit-bridge": "~2.7", "symfony/dependency-injection": "~2.0,>=2.0.5" }, "suggest": { diff --git a/src/Symfony/Component/EventDispatcher/phpunit.xml.dist b/src/Symfony/Component/EventDispatcher/phpunit.xml.dist index 9a7728e90d..b14fde5750 100644 --- a/src/Symfony/Component/EventDispatcher/phpunit.xml.dist +++ b/src/Symfony/Component/EventDispatcher/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Component/Filesystem/composer.json b/src/Symfony/Component/Filesystem/composer.json index 167dd506a9..1ef41bb9f7 100644 --- a/src/Symfony/Component/Filesystem/composer.json +++ b/src/Symfony/Component/Filesystem/composer.json @@ -18,6 +18,9 @@ "require": { "php": ">=5.3.3" }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7" + }, "autoload": { "psr-0": { "Symfony\\Component\\Filesystem\\": "" } }, diff --git a/src/Symfony/Component/Filesystem/phpunit.xml.dist b/src/Symfony/Component/Filesystem/phpunit.xml.dist index c5b7cb5ee2..32444185a1 100644 --- a/src/Symfony/Component/Filesystem/phpunit.xml.dist +++ b/src/Symfony/Component/Filesystem/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Component/Finder/composer.json b/src/Symfony/Component/Finder/composer.json index 7480b3edb1..eee7b030f7 100644 --- a/src/Symfony/Component/Finder/composer.json +++ b/src/Symfony/Component/Finder/composer.json @@ -18,6 +18,9 @@ "require": { "php": ">=5.3.3" }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7" + }, "autoload": { "psr-0": { "Symfony\\Component\\Finder\\": "" } }, diff --git a/src/Symfony/Component/Finder/phpunit.xml.dist b/src/Symfony/Component/Finder/phpunit.xml.dist index 0ed1223c20..bc38ccaa45 100644 --- a/src/Symfony/Component/Finder/phpunit.xml.dist +++ b/src/Symfony/Component/Finder/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index e5d0f06e2b..d9fcb2c0cf 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -23,6 +23,7 @@ "symfony/property-access": "~2.3" }, "require-dev": { + "symfony/phpunit-bridge": "~2.7", "doctrine/collections": "~1.0", "symfony/validator": "~2.3.0,>=2.3.20", "symfony/translation": "~2.0,>=2.0.5", diff --git a/src/Symfony/Component/Form/phpunit.xml.dist b/src/Symfony/Component/Form/phpunit.xml.dist index 7ddac030f7..104aee4b0b 100644 --- a/src/Symfony/Component/Form/phpunit.xml.dist +++ b/src/Symfony/Component/Form/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json index f77e08ebd6..ad03005b63 100644 --- a/src/Symfony/Component/HttpFoundation/composer.json +++ b/src/Symfony/Component/HttpFoundation/composer.json @@ -18,6 +18,9 @@ "require": { "php": ">=5.3.3" }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7|~3.0.0" + }, "autoload": { "psr-0": { "Symfony\\Component\\HttpFoundation\\": "" }, "classmap": [ "Symfony/Component/HttpFoundation/Resources/stubs" ] diff --git a/src/Symfony/Component/HttpFoundation/phpunit.xml.dist b/src/Symfony/Component/HttpFoundation/phpunit.xml.dist index 1c6739377c..b5b660a394 100644 --- a/src/Symfony/Component/HttpFoundation/phpunit.xml.dist +++ b/src/Symfony/Component/HttpFoundation/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Component/HttpKernel/Client.php b/src/Symfony/Component/HttpKernel/Client.php index ca3f45b6bf..fae10988e4 100644 --- a/src/Symfony/Component/HttpKernel/Client.php +++ b/src/Symfony/Component/HttpKernel/Client.php @@ -107,7 +107,7 @@ class Client extends BaseClient $code = <<=2.0.5", diff --git a/src/Symfony/Component/HttpKernel/phpunit.xml.dist b/src/Symfony/Component/HttpKernel/phpunit.xml.dist index cbfaa9f597..7901a0b8b5 100644 --- a/src/Symfony/Component/HttpKernel/phpunit.xml.dist +++ b/src/Symfony/Component/HttpKernel/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Component/Intl/composer.json b/src/Symfony/Component/Intl/composer.json index 49423b66e8..58e4241875 100644 --- a/src/Symfony/Component/Intl/composer.json +++ b/src/Symfony/Component/Intl/composer.json @@ -27,6 +27,7 @@ "php": ">=5.3.3" }, "require-dev": { + "symfony/phpunit-bridge": "~2.7", "symfony/filesystem": ">=2.1" }, "suggest": { diff --git a/src/Symfony/Component/Intl/phpunit.xml.dist b/src/Symfony/Component/Intl/phpunit.xml.dist index 7d601b27f4..d40a1582bb 100644 --- a/src/Symfony/Component/Intl/phpunit.xml.dist +++ b/src/Symfony/Component/Intl/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Component/Locale/composer.json b/src/Symfony/Component/Locale/composer.json index 121b1333f4..6795fbc852 100644 --- a/src/Symfony/Component/Locale/composer.json +++ b/src/Symfony/Component/Locale/composer.json @@ -19,6 +19,9 @@ "php": ">=5.3.3", "symfony/intl": "~2.3" }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7" + }, "autoload": { "psr-0": { "Symfony\\Component\\Locale\\": "" } }, diff --git a/src/Symfony/Component/Locale/phpunit.xml.dist b/src/Symfony/Component/Locale/phpunit.xml.dist index b526bd5915..4633ca6f04 100644 --- a/src/Symfony/Component/Locale/phpunit.xml.dist +++ b/src/Symfony/Component/Locale/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Component/OptionsResolver/composer.json b/src/Symfony/Component/OptionsResolver/composer.json index f13d246e95..1d9278a579 100644 --- a/src/Symfony/Component/OptionsResolver/composer.json +++ b/src/Symfony/Component/OptionsResolver/composer.json @@ -18,6 +18,9 @@ "require": { "php": ">=5.3.3" }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7" + }, "autoload": { "psr-0": { "Symfony\\Component\\OptionsResolver\\": "" } }, diff --git a/src/Symfony/Component/OptionsResolver/phpunit.xml.dist b/src/Symfony/Component/OptionsResolver/phpunit.xml.dist index 41c786c8c4..2398388768 100644 --- a/src/Symfony/Component/OptionsResolver/phpunit.xml.dist +++ b/src/Symfony/Component/OptionsResolver/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Component/Process/composer.json b/src/Symfony/Component/Process/composer.json index 427e63b87f..bd3758ca52 100644 --- a/src/Symfony/Component/Process/composer.json +++ b/src/Symfony/Component/Process/composer.json @@ -18,6 +18,9 @@ "require": { "php": ">=5.3.3" }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7" + }, "autoload": { "psr-0": { "Symfony\\Component\\Process\\": "" } }, diff --git a/src/Symfony/Component/Process/phpunit.xml.dist b/src/Symfony/Component/Process/phpunit.xml.dist index 8f147bca73..07b617be4b 100644 --- a/src/Symfony/Component/Process/phpunit.xml.dist +++ b/src/Symfony/Component/Process/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Component/PropertyAccess/composer.json b/src/Symfony/Component/PropertyAccess/composer.json index 318604274a..3b42432a1c 100644 --- a/src/Symfony/Component/PropertyAccess/composer.json +++ b/src/Symfony/Component/PropertyAccess/composer.json @@ -18,6 +18,9 @@ "require": { "php": ">=5.3.3" }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7" + }, "autoload": { "psr-0": { "Symfony\\Component\\PropertyAccess\\": "" } }, diff --git a/src/Symfony/Component/PropertyAccess/phpunit.xml.dist b/src/Symfony/Component/PropertyAccess/phpunit.xml.dist index c71eb65093..99858f7b95 100644 --- a/src/Symfony/Component/PropertyAccess/phpunit.xml.dist +++ b/src/Symfony/Component/PropertyAccess/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json index f1c6a20363..7300a7a379 100644 --- a/src/Symfony/Component/Routing/composer.json +++ b/src/Symfony/Component/Routing/composer.json @@ -19,6 +19,7 @@ "php": ">=5.3.3" }, "require-dev": { + "symfony/phpunit-bridge": "~2.7", "symfony/config": "~2.2", "symfony/http-foundation": "~2.3", "symfony/yaml": "~2.0,>=2.0.5", diff --git a/src/Symfony/Component/Routing/phpunit.xml.dist b/src/Symfony/Component/Routing/phpunit.xml.dist index 4144e73266..fae243c815 100644 --- a/src/Symfony/Component/Routing/phpunit.xml.dist +++ b/src/Symfony/Component/Routing/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json index 15919a4de7..2e85c41ede 100644 --- a/src/Symfony/Component/Security/composer.json +++ b/src/Symfony/Component/Security/composer.json @@ -22,6 +22,7 @@ "symfony/http-kernel": "~2.1" }, "require-dev": { + "symfony/phpunit-bridge": "~2.7", "symfony/form": "~2.0,>=2.0.5", "symfony/intl": "~2.3", "symfony/routing": "~2.2", diff --git a/src/Symfony/Component/Security/phpunit.xml.dist b/src/Symfony/Component/Security/phpunit.xml.dist index 1f1ff85fe6..9a20f91498 100644 --- a/src/Symfony/Component/Security/phpunit.xml.dist +++ b/src/Symfony/Component/Security/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json index ab537b2955..0f0695e55b 100644 --- a/src/Symfony/Component/Serializer/composer.json +++ b/src/Symfony/Component/Serializer/composer.json @@ -18,6 +18,9 @@ "require": { "php": ">=5.3.3" }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7" + }, "autoload": { "psr-0": { "Symfony\\Component\\Serializer\\": "" } }, diff --git a/src/Symfony/Component/Serializer/phpunit.xml.dist b/src/Symfony/Component/Serializer/phpunit.xml.dist index 0327a9b9d1..da0540137b 100644 --- a/src/Symfony/Component/Serializer/phpunit.xml.dist +++ b/src/Symfony/Component/Serializer/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Component/Stopwatch/composer.json b/src/Symfony/Component/Stopwatch/composer.json index 97e214fa2d..224d892435 100644 --- a/src/Symfony/Component/Stopwatch/composer.json +++ b/src/Symfony/Component/Stopwatch/composer.json @@ -18,6 +18,9 @@ "require": { "php": ">=5.3.3" }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7" + }, "autoload": { "psr-0": { "Symfony\\Component\\Stopwatch\\": "" } }, diff --git a/src/Symfony/Component/Stopwatch/phpunit.xml.dist b/src/Symfony/Component/Stopwatch/phpunit.xml.dist index ebbfd7bd51..38078d25bb 100644 --- a/src/Symfony/Component/Stopwatch/phpunit.xml.dist +++ b/src/Symfony/Component/Stopwatch/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + diff --git a/src/Symfony/Component/Templating/composer.json b/src/Symfony/Component/Templating/composer.json index b27f56c2f1..5ce972507e 100644 --- a/src/Symfony/Component/Templating/composer.json +++ b/src/Symfony/Component/Templating/composer.json @@ -18,6 +18,9 @@ "require": { "php": ">=5.3.3" }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7|~3.0.0" + }, "autoload": { "psr-0": { "Symfony\\Component\\Templating\\": "" } }, diff --git a/src/Symfony/Component/Templating/phpunit.xml.dist b/src/Symfony/Component/Templating/phpunit.xml.dist index 1bdb101a7f..3da1f5de13 100644 --- a/src/Symfony/Component/Templating/phpunit.xml.dist +++ b/src/Symfony/Component/Templating/phpunit.xml.dist @@ -7,9 +7,9 @@ bootstrap="vendor/autoload.php" > - - + + ./Tests/ diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json index 4c905342ab..150bbc2e53 100644 --- a/src/Symfony/Component/Translation/composer.json +++ b/src/Symfony/Component/Translation/composer.json @@ -19,6 +19,7 @@ "php": ">=5.3.3" }, "require-dev": { + "symfony/phpunit-bridge": "~2.7", "symfony/config": "~2.3,>=2.3.12", "symfony/intl": "~2.3", "symfony/yaml": "~2.2" diff --git a/src/Symfony/Component/Translation/phpunit.xml.dist b/src/Symfony/Component/Translation/phpunit.xml.dist index 767178d356..16cca4afb7 100644 --- a/src/Symfony/Component/Translation/phpunit.xml.dist +++ b/src/Symfony/Component/Translation/phpunit.xml.dist @@ -7,9 +7,9 @@ bootstrap="vendor/autoload.php" > - - + + ./Tests/ diff --git a/src/Symfony/Component/Validator/Tests/bootstrap.php b/src/Symfony/Component/Validator/Tests/bootstrap.php deleted file mode 100644 index 8977ca9e86..0000000000 --- a/src/Symfony/Component/Validator/Tests/bootstrap.php +++ /dev/null @@ -1,14 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -$loader = require __DIR__.'/../vendor/autoload.php'; - -Doctrine\Common\Annotations\AnnotationRegistry::registerLoader(function ($class) {return class_exists($class);}); diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index 941bf911cf..f4e5c5374e 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -20,6 +20,7 @@ "symfony/translation": "~2.0,>=2.0.5" }, "require-dev": { + "symfony/phpunit-bridge": "~2.7", "doctrine/common": "~2.3", "symfony/http-foundation": "~2.1", "symfony/intl": "~2.3", diff --git a/src/Symfony/Component/Validator/phpunit.xml.dist b/src/Symfony/Component/Validator/phpunit.xml.dist index d9851a797b..1bf4391c3c 100644 --- a/src/Symfony/Component/Validator/phpunit.xml.dist +++ b/src/Symfony/Component/Validator/phpunit.xml.dist @@ -4,12 +4,12 @@ xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd" backupGlobals="false" colors="true" - bootstrap="Tests/bootstrap.php" + bootstrap="vendor/autoload.php" > - - + + ./Tests/ diff --git a/src/Symfony/Component/Yaml/composer.json b/src/Symfony/Component/Yaml/composer.json index 1a009c16d6..9cb6bb9506 100644 --- a/src/Symfony/Component/Yaml/composer.json +++ b/src/Symfony/Component/Yaml/composer.json @@ -18,6 +18,9 @@ "require": { "php": ">=5.3.3" }, + "require-dev": { + "symfony/phpunit-bridge": "~2.7" + }, "autoload": { "psr-0": { "Symfony\\Component\\Yaml\\": "" } }, diff --git a/src/Symfony/Component/Yaml/phpunit.xml.dist b/src/Symfony/Component/Yaml/phpunit.xml.dist index 39c04ce3a6..8f7741fe39 100644 --- a/src/Symfony/Component/Yaml/phpunit.xml.dist +++ b/src/Symfony/Component/Yaml/phpunit.xml.dist @@ -7,8 +7,7 @@ bootstrap="vendor/autoload.php" > - - + From 935afe650ac597041f8323eebce18eb5465d11be Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Fri, 13 Feb 2015 16:10:22 +0100 Subject: [PATCH 09/10] [PROCESS] make sure /dev/tty is readable When using Process from Web-SAPI it is likely that the webserver user doesn't has rights to use /dev/tty --- src/Symfony/Component/Process/Process.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php index d762602925..0c886d1c0e 100644 --- a/src/Symfony/Component/Process/Process.php +++ b/src/Symfony/Component/Process/Process.php @@ -792,6 +792,9 @@ class Process if ('\\' === DIRECTORY_SEPARATOR && $tty) { throw new RuntimeException('TTY mode is not supported on Windows platform.'); } + if ($tty && (!file_exists('/dev/tty') || !is_readable('/dev/tty'))) { + throw new RuntimeException('TTY mode requires /dev/tty to be readable.'); + } $this->tty = (bool) $tty; From 4a63bde7107db24e7f4b9a24fd76847894066c34 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 24 Feb 2015 12:41:28 +0100 Subject: [PATCH 10/10] Minor hot fix --- src/Symfony/Component/HttpKernel/Client.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpKernel/Client.php b/src/Symfony/Component/HttpKernel/Client.php index fae10988e4..2c61c55dbf 100644 --- a/src/Symfony/Component/HttpKernel/Client.php +++ b/src/Symfony/Component/HttpKernel/Client.php @@ -107,7 +107,7 @@ class Client extends BaseClient $code = <<