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

Commitb0ba74d

Browse files
committed
minor#12872 [2.6] CS Fixes And Removed An Unused Import (GrahamCampbell)
This PR was squashed before being merged into the 2.6 branch (closes#12872).Discussion----------[2.6] CS Fixes And Removed An Unused Import| Q | A| ------------- | ---| Bug fix? | no| New feature? | no| BC breaks? | no| Deprecations? | no| Tests pass? | yes| Fixed tickets | N/A| License | MIT| Doc PR | N/A##### This pull request fixes some cs issues in symfony 2.6.This is the sequel to#12856.Commits-------2f10a0a [2.6] CS Fixes And Removed An Unused Import
2 parentsc4a8041 +2f10a0a commitb0ba74d

File tree

35 files changed

+116
-112
lines changed

35 files changed

+116
-112
lines changed

‎src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ protected function getDriver(ContainerBuilder $container)
196196
* @return string a service definition name
197197
*
198198
* @throws ParameterNotFoundException if none of the managerParameters has a
199-
* non-empty value.
199+
*non-empty value.
200200
*/
201201
privatefunctiongetConfigurationServiceName(ContainerBuilder$container)
202202
{

‎src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,17 @@ protected function setUp()
5454
publicfunctiontestFixManagersAutoMappingsWithTwoAutomappings()
5555
{
5656
$emConfigs =array(
57-
'em1'=>array(
58-
'auto_mapping' =>true
57+
'em1'=>array(
58+
'auto_mapping' =>true,
5959
),
60-
'em2'=>array(
61-
'auto_mapping' =>true
60+
'em2'=>array(
61+
'auto_mapping' =>true,
6262
),
6363
);
6464

6565
$bundles =array(
66-
'FristBundle'=>'My\FristBundle',
67-
'SecondBundle'=>'My\SecondBundle',
66+
'FristBundle'=>'My\FristBundle',
67+
'SecondBundle'=>'My\SecondBundle',
6868
);
6969

7070
$reflection =new \ReflectionClass(get_class($this->extension));
@@ -79,65 +79,65 @@ public function getAutomappingData()
7979
returnarray(
8080
array(
8181
array(// no auto mapping on em1
82-
'auto_mapping' =>false
82+
'auto_mapping' =>false,
8383
),
8484
array(// no auto mapping on em2
85-
'auto_mapping' =>false
85+
'auto_mapping' =>false,
8686
),
8787
array(),
88-
array()
88+
array(),
8989
),
9090
array(
9191
array(// no auto mapping on em1
92-
'auto_mapping' =>false
92+
'auto_mapping' =>false,
9393
),
9494
array(// auto mapping enabled on em2
95-
'auto_mapping' =>true
95+
'auto_mapping' =>true,
9696
),
9797
array(),
9898
array(
9999
'mappings' =>array(
100100
'FristBundle' =>array(
101101
'mapping' =>true,
102-
'is_bundle' =>true
102+
'is_bundle' =>true,
103103
),
104104
'SecondBundle' =>array(
105105
'mapping' =>true,
106-
'is_bundle' =>true
107-
)
108-
)
109-
)
106+
'is_bundle' =>true,
107+
),
108+
),
109+
),
110110
),
111111
array(
112112
array(// no auto mapping on em1, but it defines SecondBundle as own
113113
'auto_mapping' =>false,
114114
'mappings' =>array(
115115
'SecondBundle' =>array(
116116
'mapping' =>true,
117-
'is_bundle' =>true
118-
)
119-
)
117+
'is_bundle' =>true,
118+
),
119+
),
120120
),
121121
array(// auto mapping enabled on em2
122-
'auto_mapping' =>true
122+
'auto_mapping' =>true,
123123
),
124124
array(
125125
'mappings' =>array(
126126
'SecondBundle' =>array(
127127
'mapping' =>true,
128-
'is_bundle' =>true
129-
)
130-
)
128+
'is_bundle' =>true,
129+
),
130+
),
131131
),
132132
array(
133133
'mappings' =>array(
134134
'FristBundle' =>array(
135135
'mapping' =>true,
136-
'is_bundle' =>true
137-
)
138-
)
139-
)
140-
)
136+
'is_bundle' =>true,
137+
),
138+
),
139+
),
140+
),
141141
);
142142
}
143143

@@ -147,13 +147,13 @@ public function getAutomappingData()
147147
publicfunctiontestFixManagersAutoMappings(array$originalEm1,array$originalEm2,array$expectedEm1,array$expectedEm2)
148148
{
149149
$emConfigs =array(
150-
'em1'=>$originalEm1,
151-
'em2'=>$originalEm2,
150+
'em1'=>$originalEm1,
151+
'em2'=>$originalEm2,
152152
);
153153

154154
$bundles =array(
155-
'FristBundle'=>'My\FristBundle',
156-
'SecondBundle'=>'My\SecondBundle',
155+
'FristBundle'=>'My\FristBundle',
156+
'SecondBundle'=>'My\SecondBundle',
157157
);
158158

159159
$reflection =new \ReflectionClass(get_class($this->extension));
@@ -163,10 +163,10 @@ public function testFixManagersAutoMappings(array $originalEm1, array $originalE
163163
$newEmConfigs =$method->invoke($this->extension,$emConfigs,$bundles);
164164

165165
$this->assertEquals($newEmConfigs["em1"],array_merge(array(
166-
'auto_mapping' =>false
166+
'auto_mapping' =>false,
167167
),$expectedEm1));
168168
$this->assertEquals($newEmConfigs["em2"],array_merge(array(
169-
'auto_mapping' =>false
169+
'auto_mapping' =>false,
170170
),$expectedEm2));
171171
}
172172

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,5 +141,4 @@ private function hardCopy($originDir, $targetDir)
141141
// We use a custom iterator to ignore VCS files
142142
$filesystem->mirror($originDir,$targetDir, Finder::create()->ignoreDotFiles(false)->in($originDir));
143143
}
144-
145144
}

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,16 +189,16 @@ abstract protected function describeContainerParameter($parameter, array $option
189189
* Common options are:
190190
* * name: name of listened event
191191
*
192-
* @param EventDispatcherInterface$eventDispatcher
193-
* @param array$options
192+
* @param EventDispatcherInterface $eventDispatcher
193+
* @param array $options
194194
*/
195195
abstractprotectedfunctiondescribeEventDispatcherListeners(EventDispatcherInterface$eventDispatcher,array$options =array());
196196

197197
/**
198198
* Describes a callable.
199199
*
200-
* @param callable$callable
201-
* @param array$options
200+
* @param callable $callable
201+
* @param array $options
202202
*/
203203
abstractprotectedfunctiondescribeCallable($callable,array$options =array());
204204

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ private function getContainerAliasData(Alias $alias)
242242

243243
/**
244244
* @param EventDispatcherInterface $eventDispatcher
245-
* @param string|null $event
245+
* @param string|null$event
246246
*
247247
* @return array
248248
*/
@@ -270,7 +270,7 @@ private function getEventDispatcherListenersData(EventDispatcherInterface $event
270270

271271
/**
272272
* @param callable $callable
273-
* @param array $options
273+
* @param array$options
274274
*
275275
* @return array
276276
*/

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,8 @@ private function getContainerParameterDocument($parameter, $options = array())
412412
}
413413

414414
/**
415-
* @param EventDispatcherInterface$eventDispatcher
416-
* @param string|null$event
415+
* @param EventDispatcherInterface $eventDispatcher
416+
* @param string|null $event
417417
*
418418
* @return \DOMDocument
419419
*/

‎src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ public function build($controller)
122122
* Attempts to find a bundle that is *similar* to the given bundle name
123123
*
124124
* @param string $nonExistentBundleName
125+
*
125126
* @return string
126127
*/
127128
privatefunctionfindAlternative($nonExistentBundleName)

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RemoteUserFactory.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
namespaceSymfony\Bundle\SecurityBundle\DependencyInjection\Security\Factory;
1313

1414
useSymfony\Component\Config\Definition\Builder\NodeDefinition;
15-
1615
useSymfony\Component\DependencyInjection\DefinitionDecorator;
17-
1816
useSymfony\Component\DependencyInjection\ContainerBuilder;
1917
useSymfony\Component\DependencyInjection\Reference;
2018

‎src/Symfony/Component/Config/Exception/FileLoaderLoadException.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,22 @@ public function __construct($resource, $sourceResource = null, $code = null, $pr
4343
if (null ===$sourceResource) {
4444
$message .=sprintf('(which is loaded in resource "%s")',$this->varToString($resource));
4545
}else {
46-
$message .=sprintf('(which is being imported from "%s")',$this->varToString($sourceResource));
46+
$message .=sprintf('(which is being imported from "%s")',$this->varToString($sourceResource));
4747
}
4848
$message .='.';
4949

5050
// if there's no previous message, present it the default way
5151
}elseif (null ===$sourceResource) {
5252
$message .=sprintf('Cannot load resource "%s".',$this->varToString($resource));
5353
}else {
54-
$message .=sprintf('Cannot import resource "%s" from "%s".',$this->varToString($resource),$this->varToString($sourceResource));
54+
$message .=sprintf('Cannot import resource "%s" from "%s".',$this->varToString($resource),$this->varToString($sourceResource));
5555
}
5656

5757
// Is the resource located inside a bundle?
5858
if ('@' ===$resource[0]) {
5959
$parts =explode(DIRECTORY_SEPARATOR,$resource);
6060
$bundle =substr($parts[0],1);
61-
$message .=''.sprintf('Make sure the "%s" bundle is correctly registered and loaded in the application kernel class.',$bundle);
61+
$message .=''.sprintf('Make sure the "%s" bundle is correctly registered and loaded in the application kernel class.',$bundle);
6262
}
6363

6464
parent::__construct($message,$code,$previous);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ public function setOverwrite($overwrite)
382382
/**
383383
* Sets the current progress.
384384
*
385-
* @param int$step The current progress
385+
* @param int $step The current progress
386386
*
387387
* @throws \LogicException
388388
*/

0 commit comments

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