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 2b317c1

Browse filesBrowse files
fabpotfabpot
committed
minor #21363 CS fixes (fabpot)
This PR was squashed before being merged into the 2.7 branch (closes #21363). Discussion ---------- CS fixes | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Commits ------- 6830d9f fixed typo 5176f97 fixed CS
2 parents 77289b9 + 6830d9f commit 2b317c1
Copy full SHA for 2b317c1

File tree

Expand file treeCollapse file tree

57 files changed

+148
-181
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

57 files changed

+148
-181
lines changed

‎.php_cs.dist

Copy file name to clipboardExpand all lines: .php_cs.dist
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ return PhpCsFixer\Config::create()
1212
->setRiskyAllowed(true)
1313
->setFinder(
1414
PhpCsFixer\Finder::create()
15-
->in(__DIR__)
15+
->in(__DIR__.'/src')
1616
->exclude(array(
1717
// directories containing files with content that is autogenerated by `var_export`, which breaks CS in output code
1818
'src/Symfony/Component/DependencyInjection/Tests/Fixtures',

‎src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,15 @@ public static function register($mode = false)
109109
return "\x1B[{$color}m{$str}\x1B[0m";
110110
};
111111
} else {
112-
$colorize = function ($str) {return $str;};
112+
$colorize = function ($str) { return $str; };
113113
}
114114
register_shutdown_function(function () use ($getMode, &$deprecations, $deprecationHandler, $colorize) {
115115
$mode = $getMode();
116116
$currErrorHandler = set_error_handler('var_dump');
117117
restore_error_handler();
118118

119119
if ('weak' === $mode) {
120-
$colorize = function ($str) {return $str;};
120+
$colorize = function ($str) { return $str; };
121121
}
122122
if ($currErrorHandler !== $deprecationHandler) {
123123
echo "\n", $colorize('THE ERROR HANDLER HAS CHANGED!', true), "\n";

‎src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ class FooTestCase
3131
public function testLegacyFoo()
3232
{
3333
@trigger_error('silenced foo deprecation', E_USER_DEPRECATED);
34-
trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
35-
trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
34+
@trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
35+
@trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
3636
}
3737

3838
public function testNonLegacyBar()
3939
{
4040
@trigger_error('silenced bar deprecation', E_USER_DEPRECATED);
41-
trigger_error('unsilenced bar deprecation', E_USER_DEPRECATED);
41+
@trigger_error('unsilenced bar deprecation', E_USER_DEPRECATED);
4242
}
4343
}
4444

‎src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak.phpt

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak.phpt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class FooTestCase
2323
public function testLegacyFoo()
2424
{
2525
@trigger_error('silenced foo deprecation', E_USER_DEPRECATED);
26-
trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
26+
@trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
2727
}
2828
}
2929

‎src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php
-9Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -125,29 +125,20 @@ public function __unset($name)
125125
unset($this->valueHolder5157dd96e88c0->$name);
126126
}
127127

128-
/**
129-
*
130-
*/
131128
public function __clone()
132129
{
133130
$this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__clone', array());
134131

135132
$this->valueHolder5157dd96e88c0 = clone $this->valueHolder5157dd96e88c0;
136133
}
137134

138-
/**
139-
*
140-
*/
141135
public function __sleep()
142136
{
143137
$this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__sleep', array());
144138

145139
return array('valueHolder5157dd96e88c0');
146140
}
147141

148-
/**
149-
*
150-
*/
151142
public function __wakeup()
152143
{
153144
}

‎src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_with_hints.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_with_hints.php
+2-11Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -120,29 +120,20 @@ public function __unset($name)
120120
unset($this->valueHolder5157dd96e88c0->$name);
121121
}
122122

123-
/**
124-
*
125-
*/
126123
public function __clone()
127124
{
128125
$this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__clone', array());
129126

130127
$this->valueHolder5157dd96e88c0 = clone $this->valueHolder5157dd96e88c0;
131128
}
132129

133-
/**
134-
*
135-
*/
136130
public function __sleep()
137131
{
138132
$this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__sleep', array());
139133

140134
return array('valueHolder5157dd96e88c0');
141135
}
142136

143-
/**
144-
*
145-
*/
146137
public function __wakeup()
147138
{
148139
}
@@ -166,15 +157,15 @@ public function getProxyInitializer()
166157
/**
167158
* {@inheritdoc}
168159
*/
169-
public function initializeProxy() : bool
160+
public function initializeProxy(): bool
170161
{
171162
return $this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, 'initializeProxy', array());
172163
}
173164

174165
/**
175166
* {@inheritdoc}
176167
*/
177-
public function isProxyInitialized() : bool
168+
public function isProxyInitialized(): bool
178169
{
179170
return null !== $this->valueHolder5157dd96e88c0;
180171
}

‎src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function testDumpTag($template, $debug, $expectedOutput, $expectedDumped)
3232

3333
$dumped = null;
3434
$exception = null;
35-
$prevDumper = VarDumper::setHandler(function ($var) use (&$dumped) {$dumped = $var;});
35+
$prevDumper = VarDumper::setHandler(function ($var) use (&$dumped) { $dumped = $var; });
3636

3737
try {
3838
$this->assertEquals($expectedOutput, $twig->render('template'));

‎src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,17 @@ public function getTransTests()
8787

8888
// transchoice
8989
array('{% transchoice count from "messages" %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
90-
'There is no apples', array('count' => 0)),
90+
'There is no apples', array('count' => 0), ),
9191
array('{% transchoice count %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
92-
'There is 5 apples', array('count' => 5)),
92+
'There is 5 apples', array('count' => 5), ),
9393
array('{% transchoice count %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%){% endtranschoice %}',
94-
'There is 5 apples (Symfony)', array('count' => 5, 'name' => 'Symfony')),
94+
'There is 5 apples (Symfony)', array('count' => 5, 'name' => 'Symfony'), ),
9595
array('{% transchoice count with { \'%name%\': \'Symfony\' } %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%){% endtranschoice %}',
96-
'There is 5 apples (Symfony)', array('count' => 5)),
96+
'There is 5 apples (Symfony)', array('count' => 5), ),
9797
array('{% transchoice count into "fr"%}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
98-
'There is no apples', array('count' => 0)),
98+
'There is no apples', array('count' => 0), ),
9999
array('{% transchoice 5 into "fr"%}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
100-
'There is 5 apples'),
100+
'There is 5 apples', ),
101101

102102
// trans filter
103103
array('{{ "Hello"|trans }}', 'Hello'),

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/attributes.html.php

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php echo $view['form']->block($form, 'widget_attributes') ?>
1+
<?php echo $view['form']->block($form, 'widget_attributes');

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_widget.html.php

Copy file name to clipboard
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<?php if (!$label) { $label = isset($label_format)
1+
<?php if (!$label) {
2+
$label = isset($label_format)
23
? strtr($label_format, array('%name%' => $name, '%id%' => $id))
3-
: $view['form']->humanize($name); } ?>
4+
: $view['form']->humanize($name);
5+
} ?>
46
<button type="<?php echo isset($type) ? $view->escape($type) : 'button' ?>" <?php echo $view['form']->block($form, 'button_attributes') ?>><?php echo $view->escape($view['translator']->trans($label, array(), $translation_domain)) ?></button>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_options.html.php

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php echo $view['form']->block($form, 'choice_widget_options') ?>
1+
<?php echo $view['form']->block($form, 'choice_widget_options');

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_options.html.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_options.html.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php use Symfony\Component\Form\ChoiceList\View\ChoiceGroupView;
22

3-
$translatorHelper = $view['translator']; // outside of the loop for performance reasons! ?>
3+
$translatorHelper = $view['translator']; // outside of the loop for performance reasons!?>
44
<?php $formHelper = $view['form']; ?>
55
<?php foreach ($choices as $group_label => $choice): ?>
66
<?php if (is_array($choice) || $choice instanceof ChoiceGroupView): ?>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/container_attributes.html.php

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php echo $view['form']->block($form, 'widget_container_attributes') ?>
1+
<?php echo $view['form']->block($form, 'widget_container_attributes');

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/email_widget.html.php

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'email')) ?>
1+
<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'email'));

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_label.html.php

Copy file name to clipboard
+13-5Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
<?php if (false !== $label): ?>
2-
<?php if ($required) { $label_attr['class'] = trim((isset($label_attr['class']) ? $label_attr['class'] : '').' required'); } ?>
3-
<?php if (!$compound) { $label_attr['for'] = $id; } ?>
4-
<?php if (!$label) { $label = isset($label_format)
2+
<?php if ($required) {
3+
$label_attr['class'] = trim((isset($label_attr['class']) ? $label_attr['class'] : '').' required');
4+
} ?>
5+
<?php if (!$compound) {
6+
$label_attr['for'] = $id;
7+
} ?>
8+
<?php if (!$label) {
9+
$label = isset($label_format)
510
? strtr($label_format, array('%name%' => $name, '%id%' => $id))
6-
: $view['form']->humanize($name); } ?>
7-
<label <?php foreach ($label_attr as $k => $v) { printf('%s="%s" ', $view->escape($k), $view->escape($v)); } ?>><?php echo $view->escape(false !== $translation_domain ? $view['translator']->trans($label, array(), $translation_domain) : $label) ?></label>
11+
: $view['form']->humanize($name);
12+
} ?>
13+
<label <?php foreach ($label_attr as $k => $v) {
14+
printf('%s="%s" ', $view->escape($k), $view->escape($v));
15+
} ?>><?php echo $view->escape(false !== $translation_domain ? $view['translator']->trans($label, array(), $translation_domain) : $label) ?></label>
816
<?php endif ?>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_start.html.php

Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?php $method = strtoupper($method) ?>
22
<?php $form_method = $method === 'GET' || $method === 'POST' ? $method : 'POST' ?>
3-
<form name="<?php echo $name ?>" method="<?php echo strtolower($form_method) ?>" action="<?php echo $action ?>"<?php foreach ($attr as $k => $v) { printf(' %s="%s"', $view->escape($k), $view->escape($v)); } ?><?php if ($multipart): ?> enctype="multipart/form-data"<?php endif ?>>
3+
<form name="<?php echo $name ?>" method="<?php echo strtolower($form_method) ?>" action="<?php echo $action ?>"<?php foreach ($attr as $k => $v) {
4+
printf(' %s="%s"', $view->escape($k), $view->escape($v));
5+
} ?><?php if ($multipart): ?> enctype="multipart/form-data"<?php endif ?>>
46
<?php if ($form_method !== $method): ?>
57
<input type="hidden" name="_method" value="<?php echo $method ?>" />
68
<?php endif ?>

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_row.html.php

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php echo $view['form']->widget($form) ?>
1+
<?php echo $view['form']->widget($form);

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_widget.html.php

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'hidden')) ?>
1+
<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'hidden'));

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/integer_widget.html.php

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'number')) ?>
1+
<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'number'));

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_widget.html.php

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php echo str_replace('{{ widget }}', $view['form']->block($form, 'form_widget_simple'), $money_pattern) ?>
1+
<?php echo str_replace('{{ widget }}', $view['form']->block($form, 'form_widget_simple'), $money_pattern);

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/number_widget.html.php

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'text')) ?>
1+
<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'text'));

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/password_widget.html.php

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'password')) ?>
1+
<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'password'));

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/repeated_row.html.php

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php echo $view['form']->block($form, 'form_rows') ?>
1+
<?php echo $view['form']->block($form, 'form_rows');

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/reset_widget.html.php

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php echo $view['form']->block($form, 'button_widget', array('type' => isset($type) ? $type : 'reset')) ?>
1+
<?php echo $view['form']->block($form, 'button_widget', array('type' => isset($type) ? $type : 'reset'));

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/search_widget.html.php

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'search')) ?>
1+
<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'search'));

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/submit_widget.html.php

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php echo $view['form']->block($form, 'button_widget', array('type' => isset($type) ? $type : 'submit')) ?>
1+
<?php echo $view['form']->block($form, 'button_widget', array('type' => isset($type) ? $type : 'submit'));

‎src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/url_widget.html.php

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'url')) ?>
1+
<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'url'));

‎src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_c_entry_label.html.php

Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
<?php if (!$label) { $label = $view['form']->humanize($name); } ?>
1+
<?php if (!$label) {
2+
$label = $view['form']->humanize($name);
3+
} ?>
24
<label>Custom name label: <?php echo $view->escape($view['translator']->trans($label, array(), $translation_domain)) ?></label>

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,11 +390,11 @@ private function addProvidersSection(ArrayNodeDefinition $rootNode)
390390

391391
$providerNodeBuilder
392392
->validate()
393-
->ifTrue(function ($v) {return count($v) > 1;})
393+
->ifTrue(function ($v) { return count($v) > 1; })
394394
->thenInvalid('You cannot set multiple provider types for the same provider')
395395
->end()
396396
->validate()
397-
->ifTrue(function ($v) {return count($v) === 0;})
397+
->ifTrue(function ($v) { return count($v) === 0; })
398398
->thenInvalid('You must set a provider definition for the provider.')
399399
->end()
400400
;

‎src/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/WithStrictTypes.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/WithStrictTypes.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* foo
55
*/
66

7-
declare (strict_types = 1);
7+
declare(strict_types=1);
88

99
namespace Namespaced;
1010

‎src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ private function convertFileToClass($path, $file, $prefix)
179179
);
180180

181181
if ($prefix) {
182-
$candidates = array_filter($candidates, function ($candidate) use ($prefix) {return 0 === strpos($candidate, $prefix);});
182+
$candidates = array_filter($candidates, function ($candidate) use ($prefix) { return 0 === strpos($candidate, $prefix); });
183183
}
184184

185185
// We cannot use the autoloader here as most of them use require; but if the class

‎src/Symfony/Component/Debug/Resources/ext/tests/001.phpt

Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/Resources/ext/tests/001.phpt
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
--TEST--
22
Test symfony_zval_info API
33
--SKIPIF--
4-
<?php if (!extension_loaded('symfony_debug')) print 'skip'; ?>
4+
<?php if (!extension_loaded('symfony_debug')) {
5+
print 'skip';
6+
} ?>
57
--FILE--
68
<?php
79

‎src/Symfony/Component/Debug/Resources/ext/tests/002.phpt

Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/Resources/ext/tests/002.phpt
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
--TEST--
22
Test symfony_debug_backtrace in case of fatal error
33
--SKIPIF--
4-
<?php if (!extension_loaded('symfony_debug')) print 'skip'; ?>
4+
<?php if (!extension_loaded('symfony_debug')) {
5+
print 'skip';
6+
} ?>
57
--FILE--
68
<?php
79

‎src/Symfony/Component/Debug/Resources/ext/tests/002_1.phpt

Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/Resources/ext/tests/002_1.phpt
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
--TEST--
22
Test symfony_debug_backtrace in case of non fatal error
33
--SKIPIF--
4-
<?php if (!extension_loaded('symfony_debug')) print 'skip'; ?>
4+
<?php if (!extension_loaded('symfony_debug')) {
5+
print 'skip';
6+
} ?>
57
--FILE--
68
<?php
79

‎src/Symfony/Component/Debug/Resources/ext/tests/003.phpt

Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/Resources/ext/tests/003.phpt
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
--TEST--
22
Test ErrorHandler in case of fatal error
33
--SKIPIF--
4-
<?php if (!extension_loaded('symfony_debug')) print 'skip'; ?>
4+
<?php if (!extension_loaded('symfony_debug')) {
5+
print 'skip';
6+
} ?>
57
--FILE--
68
<?php
79

‎src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public function testDeprecatedSuper($class, $super, $type)
176176
{
177177
set_error_handler(function () { return false; });
178178
$e = error_reporting(0);
179-
trigger_error('', E_USER_DEPRECATED);
179+
@trigger_error('', E_USER_DEPRECATED);
180180

181181
class_exists('Test\\'.__NAMESPACE__.'\\'.$class, true);
182182

‎src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ private function checkOutEdges(array $edges)
6060
$id = $node->getId();
6161

6262
if (empty($this->checkedNodes[$id])) {
63-
6463
// don't check circular dependencies for lazy services
6564
if (!$node->getValue() || !$node->getValue()->isLazy()) {
6665
$searchKey = array_search($id, $this->currentPath);

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Container.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ public function set($id, $service, $scope = self::SCOPE_CONTAINER)
219219
*/
220220
public function has($id)
221221
{
222-
for ($i = 2;;) {
222+
for ($i = 2; ;) {
223223
if ('service_container' === $id
224224
|| isset($this->aliases[$id])
225225
|| isset($this->services[$id])
@@ -258,7 +258,7 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
258258
// available services. Service IDs are case insensitive, however since
259259
// this method can be called thousands of times during a request, avoid
260260
// calling strtolower() unless necessary.
261-
for ($i = 2;;) {
261+
for ($i = 2; ;) {
262262
if ('service_container' === $id) {
263263
return $this;
264264
}

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Definition.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public function setDecoratedService($id, $renamedId = null)
158158
}
159159

160160
/**
161-
* Gets the service that decorates this service.
161+
* Gets the service that this service is decorating.
162162
*
163163
* @return null|array An array composed of the decorated service id and the new id for it, null if no service is decorated
164164
*/

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container14.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container14.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Symfony\Component\DependencyInjection\ContainerBuilder;
66

7-
/**
7+
/*
88
* This file is included in Tests\Dumper\GraphvizDumperTest::testDumpWithFrozenCustomClassContainer
99
* and Tests\Dumper\XmlDumperTest::testCompiledContainerCanBeDumped.
1010
*/

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Symfony\Component\DependencyInjection\Dump;
34

45
use Symfony\Component\DependencyInjection\ContainerInterface;

0 commit comments

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