8000 fixed various typos · symfony/symfony@2f15ac7 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2f15ac7

Browse files
fabpotfabpot
committed
fixed various typos
1 parent e9f67a7 commit 2f15ac7

File tree

24 files changed

+50
-50
lines changed

24 files changed

+50
-50
lines changed

‎src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\DumperInterface;
2121

2222
/**
23-
* Generates dumped php code of proxies via reflection.
23+
* Generates dumped PHP code of proxies via reflection.
2424
*
2525
* @author Marco Pivetta <ocramius@gmail.com>
2626
*/

‎src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
8484

8585
$filesystem->rename($realCacheDir, $oldCacheDir);
8686
if (defined('PHP_WINDOWS_VERSION_BUILD')) {
87-
sleep(1); // workaround for windows php rename bug
87+
sleep(1); // workaround for Windows PHP rename bug
8888
}
8989
$filesystem->rename($warmupDir, $realCacheDir);
9090
}

‎src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Symfony\Component\Translation\Extractor\ExtractorInterface;
1717

1818
/**
19-
* PhpExtractor extracts translation messages from a php template.
19+
* PhpExtractor extracts translation messages from a PHP template.
2020
*
2121
* @author Michel Salib <michelsalib@hotmail.com>
2222
*/
@@ -88,7 +88,7 @@ protected function normalizeToken($token)
8888
}
8989

9090
/**
91-
* Extracts trans message from php tokens.
91+
* Extracts trans message from PHP tokens.
9292
*
9393
* @param array $tokens
9494
* @param MessageCatalogue $catalog

‎src/Symfony/Component/Config/Util/XmlUtils.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public static function convertDomElementToArray(\DomElement $element, $checkPref
168168
}
169169

170170
/**
171-
* Converts an xml value to a php type.
171+
* Converts an xml value to a PHP type.
172172
*
173173
* @param mixed $value
174174
*

‎src/Symfony/Component/Console/Helper/DialogHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ public function getName()
401401
}
402402

403403
/**
404-
* Return a valid unix shell
404+
* Return a valid Unix shell
405405
*
406406
* @return string|Boolean The valid shell name, false in case no valid shell is found
407407
*/

‎src/Symfony/Component/Console/Output/StreamOutput.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ protected function doWrite($message, $newline)
8989
*
9090
* Colorization is disabled if not supported by the stream:
9191
*
92-
* - windows without ansicon and ConEmu
92+
* - Windows without Ansicon and ConEmu
9393
* - non tty consoles
9494
*
9595
* @return Boolean true if the stream supports colorization, false otherwise

‎src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Component\DependencyInjection\Definition;
1515

1616
/**
17-
* Lazy proxy dumper capable of generating the instantiation logic php code for proxied services.
17+
* Lazy proxy dumper capable of generating the instantiation logic PHP code for proxied services.
1818
*
1919
* @author Marco Pivetta <ocramius@gmail.com>
2020
*/

‎src/Symfony/Component/DependencyInjection/SimpleXMLElement.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
class SimpleXMLElement extends \SimpleXMLElement
2222
{
2323
/**
24-
* Converts an attribute as a php type.
24+
* Converts an attribute as a PHP type.
2525
*
2626
* @param string $name
2727
*
@@ -33,7 +33,7 @@ public function getAttributeAsPhp($name)
3333
}
3434

3535
/**
36-
* Returns arguments as valid php types.
36+
* Returns arguments as valid PHP types.
3737
*
3838
* @param string $name
3939
* @param Boolean $lowercase
@@ -95,7 +95,7 @@ public function getArgumentsAsPhp($name, $lowercase = true)
9595
}
9696

9797
/**
98-
* Converts an xml value to a php type.
98+
* Converts an xml value to a PHP type.
9999
*
100100
* @param mixed $value
101101
*

‎src/Symfony/Component/Filesystem/Filesystem.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ public function exists($files)
105105
* Sets access and modification time of file.
106106
*
107107
* @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to create
108-
* @param integer $time The touch time as a unix timestamp
109-
* @param integer $atime The access time as a unix timestamp
108+
* @param integer $time The touch time as a Unix timestamp
109+
* @param integer $atime The access time as a Unix timestamp
110110
*
111111
* @throws IOException When touch fails
112112
*/
@@ -306,7 +306,7 @@ public function symlink($originDir, $targetDir, $copyOnWindows = false)
306306
*/
307307
public function makePathRelative($endPath, $startPath)
308308
{
309-
// Normalize separators on windows
309+
// Normalize separators on Windows
310310
if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
311311
$endPath = strtr($endPath, '\\', '/');
312312
$startPath = strtr($startPath, '\\', '/');

‎src/Symfony/Component/Filesystem/Tests/FilesystemTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,7 @@ public function testDumpFile()
906906
$this->assertFileExists($filename);
907907
$this->assertSame('bar', file_get_contents($filename));
908908

909-
// skip mode check on windows
909+
// skip mode check on Windows
910910
if (!defined('PHP_WINDOWS_VERSION_MAJOR')) {
911911
$this->assertEquals(753, $this->getFilePermissions($filename));
912912
}
@@ -962,21 +962,21 @@ private function markAsSkippedIfSymlinkIsMissing()
962962
}
963963

964964
if (defined('PHP_WINDOWS_VERSION_MAJOR') && false === self::$symlinkOnWindows) {
965-
$this->markTestSkipped('symlink requires "Create symbolic links" privilege on windows');
965+
$this->markTestSkipped('symlink requires "Create symbolic links" privilege on Windows');
966966
}
967967
}
968968

969969
private function markAsSkippedIfChmodIsMissing()
970970
{
971971
if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
972-
$this->markTestSkipped('chmod is not supported on windows');
972+
$this->markTestSkipped('chmod is not supported on Windows');
973973
}
974974
}
975975

976976
private function markAsSkippedIfPosixIsMissing()
977977
{
978978
if (defined('PHP_WINDOWS_VERSION_MAJOR') || !function_exists('posix_isatty')) {
979-
$this->markTestSkipped('Posix is not supported');
979+
$this->markTestSkipped('POSIX is not supported');
980980
}
981981
}
982982
}

‎src/Symfony/Component/Finder/Shell/Shell.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function getType()
5151
public function testCommand($command)
5252
{
5353
if (self::TYPE_WINDOWS === $this->type) {
54-
// todo: find a way to test if windows command exists
54+
// todo: find a way to test if Windows command exists
5555
return false;
5656
}
5757

‎src/Symfony/Component/Finder/Tests/FinderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ public function getTestPathData()
723723
public function testAccessDeniedException(Adapter\AdapterInterface $adapter)
724724
{
725725
if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
726-
$this->markTestSkipped('chmod is not supported on windows');
726+
$this->markTestSkipped('chmod is not supported on Windows');
727727
}
728728

729729
$finder = $this->buildFinder($adapter);
@@ -749,7 +749,7 @@ public function testAccessDeniedException(Adapter\AdapterInterface $adapter)
749749
public function testIgnoredAccessDeniedException(Adapter\AdapterInterface $adapter)
750750
{
751751
if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
752-
$this->markTestSkipped('chmod is not supported on windows');
752+
$this->markTestSkipped('chmod is not supported on Windows');
753753
}
754754

755755
$finder = $this->buildFinder($adapter);

‎src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ public function dataProvider()
3636
array('z', '33', '1970-02-03 00:00:00 UTC'),
3737

3838
// not bijective
39-
// this will not work as php will use actual date to replace missing info
39+
// this will not work as PHP will use actual date to replace missing info
4040
// and after change of date will lookup for closest Wednesday
41-
// i.e. value: 2010-02, php value: 2010-02-(today i.e. 20), parsed date: 2010-02-24
41+
// i.e. value: 2010-02, PHP value: 2010-02-(today i.e. 20), parsed date: 2010-02-24
4242
//array('Y-m-D', '2010-02-Wed', '2010-02-03 00:00:00 UTC'),
4343
//array('Y-m-l', '2010-02-Wednesday', '2010-02-03 00:00:00 UTC'),
4444

@@ -55,7 +55,7 @@ public function dataProvider()
5555
array('g:i:s a', '4:05:06 pm', '1970-01-01 16:05:06 UTC'),
5656
array('h:i:s a', '04:05:06 pm', '1970-01-01 16:05:06 UTC'),
5757

58-
// seconds since unix
58+
// seconds since Unix
5959
array('U', '1265213106', '2010-02-03 16:05:06 UTC'),
6060
);
6161

‎src/Symfony/Component/HttpFoundation/File/UploadedFile.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ private function getErrorMessage($errorCode)
303303
UPLOAD_ERR_NO_FILE => 'No file was uploaded.',
304304
UPLOAD_ERR_CANT_WRITE => 'The file "%s" could not be written on disk.',
305305
UPLOAD_ERR_NO_TMP_DIR => 'File could not be uploaded: missing temporary directory.',
306-
UPLOAD_ERR_EXTENSION => 'File upload was stopped by a php extension.',
306+
UPLOAD_ERR_EXTENSION => 'File upload was stopped by a PHP extension.',
307307
);
308308

309309
$maxFilesize = $errorCode === UPLOAD_ERR_INI_SIZE ? self::getMaxFilesize() / 1024 : 0;

‎src/Symfony/Component/HttpKernel/Tests/KernelTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,8 @@ public function doStuff()
334334

335335
$output = Kernel::stripComments($source);
336336

337-
// Heredocs are preserved, making the output mixing unix and windows line
338-
// endings, switching to "\n" everywhere on windows to avoid failure.
337+
// Heredocs are preserved, making the output mixing Unix and Windows line
338+
// endings, switching to "\n" everywhere on Windows to avoid failure.
339339
if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
340340
$expected = str_replace("\r\n", "\n", $expected);
341341
$output = str_replace("\r\n", "\n", $output);

‎src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ public function format($timestamp)
201201
// intl allows timestamps to be passed as arrays - we don't
202202
if (is_array($timestamp)) {
203203
$message = version_compare(PHP_VERSION, '5.3.4', '>=') ?
204-
'Only integer unix timestamps and DateTime objects are supported' :
205-
'Only integer unix timestamps are supported';
204+
'Only integer Unix timestamps and DateTime objects are supported' :
205+
'Only integer Unix timestamps are supported';
206206

207207
throw new MethodArgumentValueNotImplementedException(__METHOD__, 'timestamp', $timestamp, $message);
208208
}

‎src/Symfony/Component/Intl/Tests/DateFormatter/IntlDateFormatterTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ public function testFormatWithUnsupportedTimestampArgument()
5858
$this->assertInstanceOf('Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException', $e);
5959

6060
if (version_compare(PHP_VERSION, '5.3.4', '&g 10000 t;=')) {
61-
$this->assertStringEndsWith('Only integer unix timestamps and DateTime objects are supported. Please install the "intl" extension for full localization capabilities.', $e->getMessage());
61+
$this->assertStringEndsWith('Only integer Unix timestamps and DateTime objects are supported. Please install the "intl" extension for full localization capabilities.', $e->getMessage());
6262
} else {
63-
$this->assertStringEndsWith('Only integer unix timestamps are supported. Please install the "intl" extension for full localization capabilities.', $e->getMessage());
63+
$this->assertStringEndsWith('Only integer Unix timestamps are supported. Please install the "intl" extension for full localization capabilities.', $e->getMessage());
6464
}
6565
}
6666
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ public function __construct($commandline, $cwd = null, array $env = null, $stdin
139139
$this->commandline = $commandline;
140140
$this->cwd = $cwd;
141141

142-
// on windows, if the cwd changed via chdir(), proc_open defaults to the dir where php was started
143-
// on gnu/linux, PHP builds with --enable-maintainer-zts are also affected
142+
// on Windows, if the cwd changed via chdir(), proc_open defaults to the dir where PHP was started
143+
// on Gnu/Linux, PHP builds with --enable-maintainer-zts are also affected
144144
// @see : https://bugs.php.net/bug.php?id=51800
145145
// @see : https://bugs.php.net/bug.php?id=50524
146146

@@ -340,9 +340,9 @@ public function getPid()
340340
}
341341

342342
/**
343-
* Sends a posix signal to the process.
343+
* Sends a POSIX signal to the process.
344344
*
345-
* @param integer $signal A valid posix signal (see http://www.php.net/manual/en/pcntl.constants.php)
345+
* @param integer $signal A valid POSIX signal (see http://www.php.net/manual/en/pcntl.constants.php)
346346
* @return Process
347347
*
348348
* @throws LogicException In case the process is not running
@@ -613,7 +613,7 @@ public function getStatus()
613613
* Stops the process.
614614
*
615615
* @param integer|float $timeout The timeout in seconds
616-
* @param integer $signal A posix signal to send in case the process has not stop at timeout, default is SIGKILL
616+
* @param integer $signal A POSIX signal to send in case the process has not stop at timeout, default is SIGKILL
617617
*
618618
* @return integer The exit-code of the process
619619
*
@@ -1075,7 +1075,7 @@ private function close()
10751075
if (-1 == $this->exitcode && null !== $this->fallbackExitcode) {
10761076
$this->exitcode = $this->fallbackExitcode;
10771077
} elseif (-1 === $this->exitcode && $this->processInformation['signaled'] && 0 < $this->processInformation['termsig']) {
1078-
// if process has been signaled, no exitcode but a valid termsig, apply unix convention
1078+
// if process has been signaled, no exitcode but a valid termsig, apply Unix convention
10791079
$this->exitcode = 128 + $this->processInformation['termsig'];
10801080
}
10811081

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public function close()
8080
}
8181

8282
/**
83-
* Closes unix pipes.
83+
* Closes Unix pipes.
8484
*
8585
* Nothing happens in case file handles are used.
8686
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private function __construct()
3737
public static function escapeArgument($argument)
3838
{
3939
//Fix for PHP bug #43784 escapeshellarg removes % from given string
40-
//Fix for PHP bug #49446 escapeshellarg dosn`t work on windows
40+
//Fix for PHP bug #49446 escapeshellarg doesn't work on Windows
4141
//@see https://bugs.php.net/bug.php?id=43784
4242
//@see https://bugs.php.net/bug.php?id=49446
4343
if (defined('PHP_WINDOWS_VERSION_BUILD')) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ public function testRestart()
440440

441441
public function testPhpDeadlock()
442442
{
443-
$this->markTestSkipped('Can course php to hang');
443+
$this->markTestSkipped('Can course PHP to hang');
444444

445445
// Sleep doesn't work as it will allow the process to handle signals and close
446446
// file handles from the other end.
@@ -575,7 +575,7 @@ public function testSignalProcessNotRunning()
575575
private function verifyPosixIsEnabled()
576576
{
577577
if (defined('PHP_WINDOWS_VERSION_BUILD')) {
578-
$this->markTestSkipped('POSIX signals do not work on windows');
578+
$this->markTestSkipped('POSIX signals do not work on Windows');
579579
}
580580
if (!defined('SIGUSR1')) {
581581
$this->markTestSkipped('The pcntl extension is not enabled');
@@ -588,7 +588,7 @@ private function verifyPosixIsEnabled()
588588
public function testSignalWithWrongIntSignal()
589589
{
590590
if (defined('PHP_WINDOWS_VERSION_BUILD')) {
591-
$this->markTestSkipped('POSIX signals do not work on windows');
591+
$this->markTestSkipped('POSIX signals do not work on Windows');
592592
}
593593

594594
$process = $this->getProcess('php -r "sleep(3);"');
@@ -602,7 +602,7 @@ public function testSignalWithWrongIntSignal()
602602
public function testSignalWithWrongNonIntSignal()
603603
{
604604
if (defined('PHP_WINDOWS_VERSION_BUILD')) {
605-
$this->markTestSkipped('POSIX signals do not work on windows');
605+
$this->markTestSkipped('POSIX signals do not work on Windows');
606606
}
607607

608608
$process = $this->getProcess('php -r "sleep(3);"');

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ public function testFindWithPhpPath()
3333

3434
//not executable PHP_PATH
3535
putenv('PHP_PATH=/not/executable/php');
36-
$this->assertFalse($f->find(), '::find() returns false for not executable php');
36+
$this->assertFalse($f->find(), '::find() returns false for not executable PHP');
3737

3838
//executable PHP_PATH
3939
putenv('PHP_PATH='.$current);
40-
$this->assertEquals($f->find(), $current, '::find() returns the executable php');
40+
$this->assertEquals($f->find(), $current, '::find() returns the executable PHP');
4141
}
4242

4343
/**
@@ -55,10 +55,10 @@ public function testFindWithSuffix()
5555

5656
$current = $f->find();
5757

58-
//TODO maybe php executable is custom or even windows
58+
//TODO maybe php executable is custom or even Windows
5959
if (defined('PHP_WINDOWS_VERSION_BUILD')) {
6060
$this->assertTrue(is_executable($current));
61-
$this->assertTrue((bool) preg_match('/'.addSlashes(DIRECTORY_SEPARATOR).'php\.(exe|bat|cmd|com)$/i', $current), '::find() returns the executable php with suffixes');
61+
$this->assertTrue((bool) preg_match('/'.addSlashes(DIRECTORY_SEPARATOR).'php\.(exe|bat|cmd|com)$/i', $current), '::find() returns the executable PHP with suffixes');
6262
}
6363
}
6464
}

‎src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ protected function onLoginSuccess(Request $request, Response $response, TokenInt
116116
*
117117
* @param string $class
118118
* @param string $username The username
119-
* @param integer $expires The unixtime when the cookie expires
119+
* @param integer $expires The Unix timestamp when the cookie expires
120120
* @param string $password The encoded password
121121
*
122122
* @throws \RuntimeException if username contains invalid chars
@@ -138,7 +138,7 @@ protected function generateCookieValue($class, $username, $expires, $password)
138138
*
139139
* @param string $class
140140
* @param string $username The username
141-
* @param integer $expires The unixtime when the cookie expires
141+
* @param integer $expires The Unix timestamp when the cookie expires
142142
* @param string $password The encoded password
143143
*
144144
* @throws \RuntimeException when the private key is empty

‎src/Symfony/Component/Translation/Dumper/PhpFileDumper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Component\Translation\MessageCatalogue;
1515

1616
/**
17-
* PhpFileDumper generates php files from a message catalogue.
17+
* PhpFileDumper generates PHP files from a message catalogue.
1818
*
1919
* @author Michel Salib <michelsalib@hotmail.com>
2020
*/

0 commit comments

Comments
 (0)
0