Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 20e7cf1

Browse files
fabpotfabpot
committed
minor #12293 Remove aligned '=>' and '=' (disquedur)
This PR was squashed before being merged into the 2.3 branch (closes #12293). Discussion ---------- Remove aligned '=>' and '=' | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | [#12284] | License | MIT Could you said to me if i should make an other PR for 2.5 branch. Commits ------- 51312d3 Remove aligned '=>' and '='
2 parents 383b7fa + 51312d3 commit 20e7cf1

File tree

239 files changed

+1456
-1457
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

239 files changed

+1456
-1457
lines changed

‎UPGRADE-2.1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1107,7 +1107,7 @@
11071107

11081108
```php
11091109
$view->vars = array_replace($view->vars, array(
1110-
'help' => 'A text longer than six characters',
1110+
'help' => 'A text longer than six characters',
11111111
'error_class' => 'max_length_error',
11121112
));
11131113
```

‎src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ public function collect(Request $request, Response $response, \Exception $except
5959
}
6060

6161
$this->data = array(
62-
'queries' => $queries,
62+
'queries' => $queries,
6363
'connections' => $this->connections,
64-
'managers' => $this->managers,
64+
'managers' => $this->managers,
6565
);
6666
}
6767

‎src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ protected function loadMappingInformation(array $objectManager, ContainerBuilder
5252
foreach (array_keys($container->getParameter('kernel.bundles')) as $bundle) {
5353
if (!isset($objectManager['mappings'][$bundle])) {
5454
$objectManager['mappings'][$bundle] = array(
55-
'mapping' => true,
55+
'mapping' => true,
5656
'is_bundle' => true,
5757
);
5858
}
@@ -65,8 +65,8 @@ protected function loadMappingInformation(array $objectManager, ContainerBuilder
6565
}
6666

6767
$mappingConfig = array_replace(array(
68-
'dir' => false,
69-
'type' => false,
68+
'dir' => false,
69+
'type' => false,
7070
'prefix' => false,
7171
), (array) $mappingConfig);
7272

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,13 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
160160
};
161161

162162
$resolver->setDefaults(array(
163-
'em' => null,
164-
'property' => null,
165-
'query_builder' => null,
166-
'loader' => $loader,
167-
'choices' => null,
168-
'choice_list' => $choiceList,
169-
'group_by' => null,
163+
'em' => null,
164+
'property' => null,
165+
'query_builder' => null,
166+
'loader' => $loader,
167+
'choices' => null,
168+
'choice_list' => $choiceList,
169+
'group_by' => null,
170170
));
171171

172172
$resolver->setRequired(array('class'));

‎src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function loadTokenBySeries($series)
6363
$sql = 'SELECT class, username, value, lastUsed'
6464
.' FROM rememberme_token WHERE series=:series';
6565
$paramValues = array('series' => $series);
66-
$paramTypes = array('series' => \PDO::PARAM_STR);
66+
$paramTypes = array('series' => \PDO::PARAM_STR);
6767
$stmt = $this->conn->executeQuery($sql, $paramValues, $paramTypes);
6868
$row = $stmt->fetch(\PDO::FETCH_ASSOC);
6969
if ($row) {
@@ -85,7 +85,7 @@ public function deleteTokenBySeries($series)
8585
{
8686
$sql = 'DELETE FROM rememberme_token WHERE series=:series';
8787
$paramValues = array('series' => $series);
88-
$paramTypes = array('series' => \PDO::PARAM_STR);
88+
$paramTypes = array('series' => \PDO::PARAM_STR);
8989
$this->conn->executeUpdate($sql, $paramValues, $paramTypes);
9090
}
9191

@@ -96,12 +96,12 @@ public function updateToken($series, $tokenValue, \DateTime $lastUsed)
9696
{
9797
$sql = 'UPDATE rememberme_token SET value=:value, lastUsed=:lastUsed'
9898
.' WHERE series=:series';
99-
$paramValues = array('value' => $tokenValue,
99+
$paramValues = array('value' => $tokenValue,
100100
'lastUsed' => $lastUsed,
101-
'series' => $series,);
102-
$paramTypes = array('value' => \PDO::PARAM_STR,
101+
'series' => $series,);
102+
$paramTypes = array('value' => \PDO::PARAM_STR,
103103
'lastUsed' => DoctrineType::DATETIME,
104-
'series' => \PDO::PARAM_STR,);
104+
'series' => \PDO::PARAM_STR,);
105105
$updated = $this->conn->executeUpdate($sql, $paramValues, $paramTypes);
106106
if ($updated < 1) {
107107
throw new TokenNotFoundException('No token found.');
@@ -116,15 +116,15 @@ public function createNewToken(PersistentTokenInterface $token)
116116
$sql = 'INSERT INTO rememberme_token'
117117
.' (class, username, series, value, lastUsed)'
118118
.' VALUES (:class, :username, :series, :value, :lastUsed)';
119-
$paramValues = array('class' => $token->getClass(),
119+
$paramValues = array('class' => $token->getClass(),
120120
'username' => $token->getUsername(),
121-
'series' => $token->getSeries(),
122-
'value' => $token->getTokenValue(),
121+
'series' => $token->getSeries(),
122+
'value' => $token->getTokenValue(),
123123
'lastUsed' => $token->getLastUsed(),);
124-
$paramTypes = array('class' => \PDO::PARAM_STR,
124+
$paramTypes = array('class' => \PDO::PARAM_STR,
125125
'username' => \PDO::PARAM_STR,
126-
'series' => \PDO::PARAM_STR,
127-
'value' => \PDO::PARAM_STR,
126+
'series' => \PDO::PARAM_STR,
127+
'value' => \PDO::PARAM_STR,
128128
'lastUsed' => DoctrineType::DATETIME,);
129129
$this->conn->executeUpdate($sql, $paramValues, $paramTypes);
130130
}

‎src/Symfony/Bridge/Doctrine/Tests/DataFixtures/ContainerAwareLoaderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ protected function setUp()
3030
public function testShouldSetContainerOnContainerAwareFixture()
3131
{
3232
$container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
33-
$loader = new ContainerAwareLoader($container);
34-
$fixture = new ContainerAwareFixture();
33+
$loader = new ContainerAwareLoader($container);
34+
$fixture = new ContainerAwareFixture();
3535

3636
$loader->addFixture($fixture);
3737

‎src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function testLogNonUtf8()
6868
;
6969

7070
$dbalLogger->startQuery('SQL', array(
71-
'utf8' => 'foo',
71+
'utf8' => 'foo',
7272
'nonutf8' => "\x7F\xFF",
7373
));
7474
}
@@ -97,7 +97,7 @@ public function testLogLongString()
9797

9898
$dbalLogger->startQuery('SQL', array(
9999
'short' => $shortString,
100-
'long' => $longString,
100+
'long' => $longString,
101101
));
102102
}
103103

@@ -135,7 +135,7 @@ public function testLogUTF8LongString()
135135

136136
$dbalLogger->startQuery('SQL', array(
137137
'short' => $shortString,
138-
'long' => $longString,
138+
'long' => $longString,
139139
));
140140
}
141141
}

‎src/Symfony/Bridge/Monolog/Handler/DebugHandler.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ public function getLogs()
3030
$records = array();
3131
foreach ($this->records as $record) {
3232
$records[] = array(
33-
'timestamp' => $record['datetime']->getTimestamp(),
34-
'message' => $record['message'],
35-
'priority' => $record['level'],
33+
'timestamp' => $record['datetime']->getTimestamp(),
34+
'message' => $record['message'],
35+
'priority' => $record['level'],
3636
'priorityName' => $record['level_name'],
37-
'context' => $record['context'],
37+
'context' => $record['context'],
3838
);
3939
}
4040

‎src/Symfony/Bridge/Monolog/Tests/Processor/WebProcessorTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ protected function setUp()
2828
public function testUsesRequestServerData()
2929
{
3030
$server = array(
31-
'REQUEST_URI' => 'A',
32-
'REMOTE_ADDR' => 'B',
31+
'REQUEST_URI' => 'A',
32+
'REMOTE_ADDR' => 'B',
3333
'REQUEST_METHOD' => 'C',
34-
'SERVER_NAME' => 'D',
35-
'HTTP_REFERER' => 'E',
34+
'SERVER_NAME' => 'D',
35+
'HTTP_REFERER' => 'E',
3636
);
3737

3838
$request = new Request();

‎src/Symfony/Bridge/Propel1/DataCollector/PropelDataCollector.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ public function __construct(PropelLogger $logger, \PropelConfiguration $propelCo
5555
public function collect(Request $request, Response $response, \Exception $exception = null)
5656
{
5757
$this->data = array(
58-
'queries' => $this->buildQueries(),
59-
'querycount' => $this->countQueries(),
58+
'queries' => $this->buildQueries(),
59+
'querycount' => $this->countQueries(),
6060
);
6161
}
6262

@@ -118,16 +118,16 @@ private function buildQueries()
118118
$innerGlue = $this->propelConfiguration->getParameter('debugpdo.logging.innerglue', ': ');
119119

120120
foreach ($this->logger->getQueries() as $q) {
121-
$parts = explode($outerGlue, $q, 4);
121+
$parts = explode($outerGlue, $q, 4);
122122

123-
$times = explode($innerGlue, $parts[0]);
124-
$con = explode($innerGlue, $parts[2]);
125-
$memories = explode($innerGlue, $parts[1]);
123+
$times = explode($innerGlue, $parts[0]);
124+
$con = explode($innerGlue, $parts[2]);
125+
$memories = explode($innerGlue, $parts[1]);
126126

127-
$sql = trim($parts[3]);
128-
$con = trim($con[1]);
129-
$time = trim($times[1]);
130-
$memory = trim($memories[1]);
127+
$sql = trim($parts[3]);
128+
$con = trim($con[1]);
129+
$time = trim($times[1]);
130+
$memory = trim($memories[1]);
131131

132132
$queries[] = array('connection' => $con, 'sql' => $sql, 'time' => $time, 'memory' => $memory);
133133
}

0 commit comments

Comments
 (0)