Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 7d80045

Browse filesBrowse files
fabpotfabpot
committed
Merge branch '2.4'
* 2.4: fixed typos Fixed deprecated method calls Add testing against HHVM at Travis-CI Fixed typo Fixed typo Fixed typo fixed acronyms [Validator] Fixed IBAN validator with 0750447346 value Conflicts: src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
2 parents f063108 + 3a1d220 commit 7d80045
Copy full SHA for 7d80045

File tree

Expand file treeCollapse file tree

35 files changed

+59
-46
lines changed
Filter options
Expand file treeCollapse file tree

35 files changed

+59
-46
lines changed

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+6-1Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@ php:
55
- 5.3
66
- 5.4
77
- 5.5
8+
- hhvm
9+
10+
matrix:
11+
allow_failures:
12+
- php: hhvm
813

914
services: mongodb
1015

1116
before_script:
1217
- sudo apt-get install parallel
13-
- echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
18+
- sh -c 'if [ $(php -r "echo (int) defined("HHVM_VERSION");") -eq 0 ]; then echo "" >> "~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini"; fi;'
1419
- echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
1520
- sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
1621
- echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini

‎src/Symfony/Bridge/Doctrine/Form/DoctrineOrmExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Form/DoctrineOrmExtension.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function __construct(ManagerRegistry $registry)
2727
protected function loadTypes()
2828
{
2929
return array(
30-
new Type\EntityType($this->registry, PropertyAccess::getPropertyAccessor()),
30+
new Type\EntityType($this->registry, PropertyAccess::createPropertyAccessor()),
3131
);
3232
}
3333

‎src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ abstract class DoctrineType extends AbstractType
4545
public function __construct(ManagerRegistry $registry, PropertyAccessorInterface $propertyAccessor = null)
4646
{
4747
$this->registry = $registry;
48-
$this->propertyAccessor = $propertyAccessor ?: PropertyAccess::getPropertyAccessor();
48+
$this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
4949
}
5050

5151
public function buildForm(FormBuilderInterface $builder, array $options)

‎src/Symfony/Bridge/Propel1/Form/PropelExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Propel1/Form/PropelExtension.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class PropelExtension extends AbstractExtension
2424
protected function loadTypes()
2525
{
2626
return array(
27-
new Type\ModelType(PropertyAccess::getPropertyAccessor()),
27+
new Type\ModelType(PropertyAccess::createPropertyAccessor()),
2828
new Type\TranslationCollectionType(),
2929
new Type\TranslationType()
3030
);

‎src/Symfony/Bridge/Propel1/Form/Type/ModelType.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Propel1/Form/Type/ModelType.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class ModelType extends AbstractType
5757

5858
public function __construct(PropertyAccessorInterface $propertyAccessor = null)
5959
{
60-
$this->propertyAccessor = $propertyAccessor ?: PropertyAccess::getPropertyAccessor();
60+
$this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
6161
}
6262

6363
public function buildForm(FormBuilderInterface $builder, array $options)

‎src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ CHANGELOG
4545
* replaced Symfony\Component\HttpKernel\Debug\ContainerAwareTraceableEventDispatcher by Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher
4646
* added Client::enableProfiler()
4747
* a new parameter has been added to the DIC: `router.request_context.base_url`
48-
You can customize it for your functional tests or for generating urls with
49-
the right base url when your are in the cli context.
48+
You can customize it for your functional tests or for generating URLs with
49+
the right base URL when your are in the CLI context.
5050
* added support for default templates per render tag
5151

5252
2.1.0

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757

5858
<service id="templating.asset.request_aware_package" class="Symfony\Component\Templating\Asset\PackageInterface" factory-service="templating.asset.package_factory" factory-method="getPackage" abstract="true">
5959
<argument type="service" id="request" strict="false" />
60-
<argument /> <!-- http id -->
61-
<argument /> <!-- ssl id -->
60+
<argument /> <!-- HTTP id -->
61+
<argument /> <!-- SSL id -->
6262
</service>
6363

6464
<service id="templating.asset.package_factory" class="%templating.asset.package_factory.class%">

‎src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public function getUser()
7474
/**
7575
* Returns the current request.
7676
*
77-
* @return Request|null The http request object
77+
* @return Request|null The HTTP request object
7878
*/
7979
public function getRequest()
8080
{

‎src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ protected static function getPhpUnitXmlDir()
9393
* PHPUnit will use the last configuration argument on the command line, so this only returns
9494
* the last configuration argument.
9595
*
96-
* @return string The value of the PHPUnit cli configuration option
96+
* @return string The value of the PHPUnit CLI configuration option
9797
*/
9898
private static function getPhpUnitCliConfigArgument()
9999
{

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public function testTemplating()
153153

154154
$this->assertEquals('request', $container->getDefinition('templating.helper.assets')->getScope(), '->registerTemplatingConfiguration() sets request scope on assets helper if one or more packages are request-scoped');
155155

156-
// default package should have one http base url and path package ssl url
156+
// default package should have one HTTP base URL and path package SSL URL
157157
$this->assertTrue($container->hasDefinition('templating.asset.default_package.http'));
158158
$package = $container->getDefinition('templating.asset.default_package.http');
159159
$this->assertInstanceOf('Symfony\\Component\\DependencyInjection\\DefinitionDecorator', $package);

‎src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function testTransWithoutCaching()
4545
{
4646
$translator = $this->getTranslator($this->getLoader());
4747
$translator->setLocale('fr');
48-
$translator->setFallbackLocale(array('en', 'es', 'pt-PT', 'pt_BR'));
48+
$translator->setFallbackLocales(array('en', 'es', 'pt-PT', 'pt_BR'));
4949

5050
$this->assertEquals('foo (FR)', $translator->trans('foo'));
5151
$this->assertEquals('bar (EN)', $translator->trans('bar'));
@@ -61,7 +61,7 @@ public function testTransWithCaching()
6161
// prime the cache
6262
$translator = $this->getTranslator($this->getLoader(), array('cache_dir' => $this->tmpDir));
6363
$translator->setLocale('fr');
64-
$translator->setFallbackLocale(array('en', 'es', 'pt-PT', 'pt_BR'));
64+
$translator->setFallbackLocales(array('en', 'es', 'pt-PT', 'pt_BR'));
6565

6666
$this->assertEquals('foo (FR)', $translator->trans('foo'));
6767
$this->assertEquals('bar (EN)', $translator->trans('bar'));
@@ -75,7 +75,7 @@ public function testTransWithCaching()
7575
$loader = $this->getMock('Symfony\Component\Translation\Loader\LoaderInterface');
7676
$translator = $this->getTranslator($loader, array('cache_dir' => $this->tmpDir));
7777
$translator->setLocale('fr');
78-
$translator->setFallbackLocale(array('en', 'es', 'pt-PT', 'pt_BR'));
78+
$translator->setFallbackLocales(array('en', 'es', 'pt-PT', 'pt_BR'));
7979

8080
$this->assertEquals('foo (FR)', $translator->trans('foo'));
8181
$this->assertEquals('bar (EN)', $translator->trans('bar'));

‎src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class ProfilerController
3737
/**
3838
* Constructor.
3939
*
40-
* @param UrlGeneratorInterface $generator The Url Generator
40+
* @param UrlGeneratorInterface $generator The URL Generator
4141
* @param Profiler $profiler The profiler
4242
* @param \Twig_Environment $twig The twig environment
4343
* @param array $templates The templates

‎src/Symfony/Component/BrowserKit/Client.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/BrowserKit/Client.php
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ protected function filterResponse($response)
412412
*
413413
* This method returns null if the DomCrawler component is not available.
414414
*
415-
* @param string $uri A uri
415+
* @param string $uri A URI
416416
* @param string $content Content for the crawler to use
417417
* @param string $type Content type
418418
*
@@ -534,9 +534,9 @@ public function restart()
534534
/**
535535
* Takes a URI and converts it to absolute if it is not already absolute.
536536
*
537-
* @param string $uri A uri
537+
* @param string $uri A URI
538538
*
539-
* @return string An absolute uri
539+
* @return string An absolute URI
540540
*/
541541
protected function getAbsoluteUri($uri)
542542
{

‎src/Symfony/Component/Console/Tests/Helper/DialogHelperTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Tests/Helper/DialogHelperTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public function testAskAndValidate()
157157
}
158158
}
159159

160-
public function testNoInteration()
160+
public function testNoInteraction()
161161
{
162162
$dialog = new DialogHelper();
163163

‎src/Symfony/Component/Debug/ErrorHandler.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/ErrorHandler.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,10 @@ function ($row) {
162162

163163
// we must stop the PHP script execution, as the exception has
164164
// already been dealt with, so, let's throw an exception that
165-
// will be catched by a dummy exception handler
165+
// will be caught by a dummy exception handler
166166
set_exception_handler(function (\Exception $e) use ($exceptionHandler) {
167167
if (!$e instanceof DummyException) {
168-
// happens if our dummy exception is catched by a
168+
// happens if our dummy exception is caught by a
169169
// catch-all from user code, in which case, let's the
170170
// current handler handle this "new" exception
171171
call_user_func($exceptionHandler, $e);

‎src/Symfony/Component/DomCrawler/Link.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DomCrawler/Link.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public function getUri()
112112
if ('?' === $uri[0]) {
113113
$baseUri = $this->currentUri;
114114

115-
// remove the query string from the current uri
115+
// remove the query string from the current URI
116116
if (false !== $pos = strpos($baseUri, '?')) {
117117
$baseUri = substr($baseUri, 0, $pos);
118118
}
@@ -140,7 +140,7 @@ public function getUri()
140140
}
141141

142142
/**
143-
* Returns raw uri data.
143+
* Returns raw URI data.
144144
*
145145
* @return string
146146
*/

‎src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ public function testBaseTag()
712712
$this->assertEquals('http://base.com/link', $crawler->filterXPath('//a')->link()->getUri());
713713

714714
$crawler = new Crawler('<html><base href="//base.com"><a href="link"></a></html>', 'https://domain.com');
715-
$this->assertEquals('https://base.com/link', $crawler->filterXPath('//a')->link()->getUri(), '<base> tag can use a schema-less url');
715+
$this->assertEquals('https://base.com/link', $crawler->filterXPath('//a')->link()->getUri(), '<base> tag can use a schema-less URL');
716716

717717
$crawler = new Crawler('<html><base href="path/"><a href="link"></a></html>', 'https://domain.com');
718718
$this->assertEquals('https://domain.com/path/link', $crawler->filterXPath('//a')->link()->getUri(), '<base> tag can set a path');

‎src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ public function preListenerCall($eventName, $listener)
262262
* @param object $listener The listener
263263
* @param string $eventName The event name
264264
*
265-
* @return array Informations about the listener
265+
* @return array Information about the listener
266266
*/
267267
private function getListenerInfo($listener, $eventName)
268268
{

‎src/Symfony/Component/Form/Extension/Core/ChoiceList/ObjectChoiceList.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/ChoiceList/ObjectChoiceList.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class ObjectChoiceList extends ChoiceList
8787
*/
8888
public function __construct($choices, $labelPath = null, array $preferredChoices = array(), $groupPath = null, $valuePath = null, PropertyAccessorInterface $propertyAccessor = null)
8989
{
90-
$this->propertyAccessor = $propertyAccessor ?: PropertyAccess::getPropertyAccessor();
90+
$this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
9191
$this->labelPath = null !== $labelPath ? new PropertyPath($labelPath) : null;
9292
$this->groupPath = null !== $groupPath ? new PropertyPath($groupPath) : null;
9393
$this->valuePath = null !== $valuePath ? new PropertyPath($valuePath) : null;

‎src/Symfony/Component/Form/Extension/Core/CoreExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/CoreExtension.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class CoreExtension extends AbstractExtension
2424
protected function loadTypes()
2525
{
2626
return array(
27-
new Type\FormType(PropertyAccess::getPropertyAccessor()),
27+
new Type\FormType(PropertyAccess::createPropertyAccessor()),
2828
new Type\BirthdayType(),
2929
new Type\CheckboxType(),
3030
new Type\ChoiceType(),

‎src/Symfony/Component/Form/Extension/Core/Type/FormType.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Extension/Core/Type/FormType.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class FormType extends BaseType
3131

3232
public function __construct(PropertyAccessorInterface $propertyAccessor = null)
3333
{
34-
$this->propertyAccessor = $propertyAccessor ?: PropertyAccess::getPropertyAccessor();
34+
$this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
3535
}
3636

3737
/**

‎src/Symfony/Component/HttpFoundation/RedirectResponse.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/RedirectResponse.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class RedirectResponse extends Response
2727
*
2828
* @param string $url The URL to redirect to
2929
* @param integer $status The status code (302 by default)
30-
* @param array $headers The headers (Location is always set to the given url)
30+
* @param array $headers The headers (Location is always set to the given URL)
3131
*
3232
* @throws \InvalidArgumentException
3333
*

‎src/Symfony/Component/HttpFoundation/Request.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Request.php
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -881,14 +881,14 @@ public function getBasePath()
881881
}
882882

883883
/**
884-
* Returns the root url from which this request is executed.
884+
* Returns the root URL from which this request is executed.
885885
*
886886
* The base URL never ends with a /.
887887
*
888888
* This is similar to getBasePath(), except that it also includes the
889889
* script filename (e.g. index.php) if one exists.
890890
*
891-
* @return string The raw url (i.e. not urldecoded)
891+
* @return string The raw URL (i.e. not urldecoded)
892892
*
893893
* @api
894894
*/
@@ -1615,13 +1615,13 @@ protected function prepareRequestUri()
16151615
$requestUri = $this->headers->get('X_REWRITE_URL');
16161616
$this->headers->remove('X_REWRITE_URL');
16171617
} elseif ($this->server->get('IIS_WasUrlRewritten') == '1' && $this->server->get('UNENCODED_URL') != '') {
1618-
// IIS7 with URL Rewrite: make sure we get the unencoded url (double slash problem)
1618+
// IIS7 with URL Rewrite: make sure we get the unencoded URL (double slash problem)
16191619
$requestUri = $this->server->get('UNENCODED_URL');
16201620
$this->server->remove('UNENCODED_URL');
16211621
$this->server->remove('IIS_WasUrlRewritten');
16221622
} elseif ($this->server->has('REQUEST_URI')) {
16231623
$requestUri = $this->server->get('REQUEST_URI');
1624-
// HTTP proxy reqs setup request uri with scheme and host [and port] + the url path, only use url path
1624+
// HTTP proxy reqs setup request URI with scheme and host [and port] + the URL path, only use URL path
16251625
$schemeAndHttpHost = $this->getSchemeAndHttpHost();
16261626
if (strpos($requestUri, $schemeAndHttpHost) === 0) {
16271627
$requestUri = substr($requestUri, strlen($schemeAndHttpHost));

‎src/Symfony/Component/HttpFoundation/Response.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Response.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1242,7 +1242,7 @@ public function isEmpty()
12421242
}
12431243

12441244
/**
1245-
* Check if we need to remove Cache-Control for ssl encrypted downloads when using IE < 9
1245+
* Check if we need to remove Cache-Control for SSL encrypted downloads when using IE < 9
12461246
*
12471247
* @link http://support.microsoft.com/kb/323308
12481248
*/

‎src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,10 +205,10 @@ public function testFilter()
205205

206206
$this->assertEquals('example@example.com', $bag->filter('email', '', false, FILTER_VALIDATE_EMAIL), '->filter() gets a value of parameter as email');
207207

208-
$this->assertEquals('http://example.com/foo', $bag->filter('url', '', false, FILTER_VALIDATE_URL, array('flags' => FILTER_FLAG_PATH_REQUIRED)), '->filter() gets a value of parameter as url with a path');
208+
$this->assertEquals('http://example.com/foo', $bag->filter('url', '', false, FILTER_VALIDATE_URL, array('flags' => FILTER_FLAG_PATH_REQUIRED)), '->filter() gets a value of parameter as URL with a path');
209209

210210
// This test is repeated for code-coverage
211-
$this->assertEquals('http://example.com/foo', $bag->filter('url', '', false, FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED), '->filter() gets a value of parameter as url with a path');
211+
$this->assertEquals('http://example.com/foo', $bag->filter('url', '', false, FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED), '->filter() gets a value of parameter as URL with a path');
212212

213213
$this->assertFalse($bag->filter('dec', '', false, FILTER_VALIDATE_INT, array(
214214
'flags' => FILTER_FLAG_ALLOW_HEX,

‎src/Symfony/Component/HttpFoundation/Tests/RequestTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ public function testGetPort()
715715
));
716716
$port = $request->getPort();
717717

718-
$this->assertEquals(80, $port, 'If X_FORWARDED_PROTO is set to http return 80.');
718+
$this->assertEquals(80, $port, 'If X_FORWARDED_PROTO is set to HTTP return 80.');
719719

720720
$request = Request::create('http://example.com', 'GET', array(), array(), array(), array(
721721
'HTTP_X_FORWARDED_PROTO' => 'On'

‎src/Symfony/Component/HttpKernel/Kernel.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Kernel.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
187187
}
188188

189189
/**
190-
* Gets a http kernel from the container
190+
* Gets a HTTP kernel from the container
191191
*
192192
* @return HttpKernel
193193
*/

‎src/Symfony/Component/Process/Process.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Process/Process.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1123,7 +1123,7 @@ private function readPipes($blocking, $close)
11231123
}
11241124

11251125
/**
1126-
* Captures the exitcode if mentioned in the process informations.
1126+
* Captures the exitcode if mentioned in the process information.
11271127
*/
11281128
private function captureExitCode()
11291129
{

‎src/Symfony/Component/Routing/Generator/ConfigurableRequirementsInterface.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Generator/ConfigurableRequirementsInterface.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* params because they come from third party libs but don't want to have a 404 in
2626
* production environment. It should log the mismatch so one can review it.
2727
* - setStrictRequirements(null): Return the URL with the given parameters without
28-
* checking the requirements at all. When generating an URL you should either trust
28+
* checking the requirements at all. When generating a URL you should either trust
2929
* your params or you validated them beforehand because otherwise it would break your
3030
* link anyway. So in production environment you should know that params always pass
3131
* the requirements. Thus this option allows to disable the check on URL generation for

‎src/Symfony/Component/Routing/Generator/UrlGenerator.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Generator/UrlGenerator.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa
188188
$url = '/';
189189
}
190190

191-
// the contexts base url is already encoded (see Symfony\Component\HttpFoundation\Request)
191+
// the contexts base URL is already encoded (see Symfony\Component\HttpFoundation\Request)
192192
$url = strtr(rawurlencode($url), $this->decodedChars);
193193

194194
// the path segments "." and ".." are interpreted as relative reference when resolving a URI; see http://tools.ietf.org/html/rfc3986#section-3.3

‎src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ private function startAuthentication(Request $request, AuthenticationException $
199199
*/
200200
protected function setTargetPath(Request $request)
201201
{
202-
// session isn't required when using http basic authentication mechanism for example
202+
// session isn't required when using HTTP basic authentication mechanism for example
203203
if ($request->hasSession() && $request->isMethodSafe()) {
204204
$request->getSession()->set('_security.'.$this->providerKey.'.target_path', $request->getUri());
205205
}

‎src/Symfony/Component/Security/Http/HttpUtils.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Http/HttpUtils.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class HttpUtils
3535
* Constructor.
3636
*
3737
* @param UrlGeneratorInterface $urlGenerator A UrlGeneratorInterface instance
38-
* @param UrlMatcherInterface|RequestMatcherInterface $urlMatcher The Url or Request matcher
38+
* @param UrlMatcherInterface|RequestMatcherInterface $urlMatcher The URL or Request matcher
3939
*
4040
* @throws \InvalidArgumentException
4141
*/
@@ -146,7 +146,7 @@ public function generateUri($request, $path)
146146

147147
$url = $this->urlGenerator->generate($path, $request->attributes->all(), UrlGeneratorInterface::ABSOLUTE_URL);
148148

149-
// unnecessary query string parameters must be removed from url
149+
// unnecessary query string parameters must be removed from URL
150150
// (ie. query parameters that are presents in $attributes)
151151
// fortunately, they all are, so we have to remove entire query string
152152
$position = strpos($url, '?');

‎src/Symfony/Component/Translation/Loader/PoFileLoader.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Loader/PoFileLoader.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ private function parse($resource)
146146
}
147147

148148
/**
149-
* Save a translation item to the messeages.
149+
* Save a translation item to the messages.
150150
*
151151
* A .po file could contain by error missing plural indexes. We need to
152152
* fix these before saving them.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.