Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commit83a5d0c

Browse files
Merge branch '2.8' into 3.4
* 2.8: CS fix [Debug] fix compat with PHP 7.3
2 parents25055be +aea4a62 commit83a5d0c

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

‎src/Symfony/Component/Console/Tests/Fixtures/Foo6Command.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?php
22

3-
43
useSymfony\Component\Console\Command\Command;
54

65
class Foo6Commandextends Command

‎src/Symfony/Component/CssSelector/XPath/Translator.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public static function getXpathLiteral($element)
8989
}
9090
}
9191

92-
returnsprintf('concat(%s)',implode($parts,','));
92+
returnsprintf('concat(%s)',implode(',',$parts));
9393
}
9494

9595
/**

‎src/Symfony/Component/Debug/Tests/phpt/decorate_exception_hander.phpt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
Test catching fatal errors when handlers are nested
3+
--INI--
4+
display_errors=0
35
--FILE--
46
<?php
57

@@ -24,7 +26,6 @@ if (true) {
2426

2527
?>
2628
--EXPECTF--
27-
Fatal error: Class 'Symfony\Component\Debug\missing' not found in %s on line %d
2829
object(Symfony\Component\Debug\Exception\ClassNotFoundException)#%d (8) {
2930
["message":protected]=>
3031
string(131) "Attempted to load class "missing" from namespace "Symfony\Component\Debug".

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti
5757
.$this->writeLong($offset[2] +$sourcesStart +$sourcesSize);
5858
}
5959

60-
$output =implode(array_map(array($this,'writeLong'),$header))
60+
$output =implode('',array_map(array($this,'writeLong'),$header))
6161
.$sourceOffsets
6262
.$targetOffsets
6363
.$sources

‎src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -355,10 +355,10 @@ private function validateObject($object, $propertyPath, array $groups, $traversa
355355
* objects are iterated as well. Nested arrays are always iterated,
356356
* regardless of the value of $recursive.
357357
*
358-
* @param iterable $collectionThe collection
359-
* @param string $propertyPathThe current property path
360-
* @param (string|GroupSequence)[] $groupsThe validated groups
361-
* @param ExecutionContextInterface $contextThe current execution context
358+
* @param iterable $collection The collection
359+
* @param string $propertyPath The current property path
360+
* @param (string|GroupSequence)[] $groups The validated groups
361+
* @param ExecutionContextInterface $context The current execution context
362362
*
363363
* @see ClassNode
364364
* @see CollectionNode

‎src/Symfony/Component/VarDumper/Caster/LinkStub.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ public function __construct($label, $line = 0, $href = null)
5555
if ($composerRoot =$this->getComposerRoot($href,$this->inVendor)) {
5656
$this->attr['ellipsis'] =\strlen($href) -\strlen($composerRoot) +1;
5757
$this->attr['ellipsis-type'] ='path';
58-
$this->attr['ellipsis-tail'] =1 + ($this->inVendor ?2 +\strlen(implode(\array_slice(explode(\DIRECTORY_SEPARATOR,substr($href,1 -$this->attr['ellipsis'])),0,2))) :0);
58+
$this->attr['ellipsis-tail'] =1 + ($this->inVendor ?2 +\strlen(implode('',\array_slice(explode(\DIRECTORY_SEPARATOR,substr($href,1 -$this->attr['ellipsis'])),0,2))) :0);
5959
}elseif (3 <\count($ellipsis =explode(\DIRECTORY_SEPARATOR,$href))) {
60-
$this->attr['ellipsis'] =2 +\strlen(implode(\array_slice($ellipsis, -2)));
60+
$this->attr['ellipsis'] =2 +\strlen(implode('',\array_slice($ellipsis, -2)));
6161
$this->attr['ellipsis-type'] ='path';
6262
$this->attr['ellipsis-tail'] =1;
6363
}

‎src/Symfony/Component/Yaml/Inline.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ public static function parseScalar($scalar, $flags = 0, $delimiters = null, &$i
325325
if (null !==$delimiters) {
326326
$tmp =ltrim(substr($scalar,$i),'');
327327
if ('' ===$tmp) {
328-
thrownewParseException(sprintf('Unexpected end of line, expected one of "%s".',implode($delimiters)),self::$parsedLineNumber +1,$scalar,self::$parsedFilename);
328+
thrownewParseException(sprintf('Unexpected end of line, expected one of "%s".',implode('',$delimiters)),self::$parsedLineNumber +1,$scalar,self::$parsedFilename);
329329
}
330330
if (!\in_array($tmp[0],$delimiters)) {
331331
thrownewParseException(sprintf('Unexpected characters (%s).',substr($scalar,$i)),self::$parsedLineNumber +1,$scalar,self::$parsedFilename);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp