Skip to content

Commit 51312d3

Browse files
polcfabpot
polc
authored and
fabpot
committed
Remove aligned '=>' and '='
1 parent 91fde69 commit 51312d3

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

+1-1
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

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

+3-3
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

+7-7
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

+12-12
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

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

+3-3
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

+4-4
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

+4-4
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

+10-10
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
}

‎src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php

+6-7
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use \ModelCriteria;
1515
use \BaseObject;
1616
use \Persistent;
17-
1817
use Symfony\Component\Form\Exception\StringCastException;
1918
use Symfony\Component\Form\Extension\Core\ChoiceList\ObjectChoiceList;
2019
use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
@@ -86,21 +85,21 @@ class ModelChoiceList extends ObjectChoiceList
8685
*/
8786
public function __construct($class, $labelPath = null, $choices = null, $queryObject = null, $groupPath = null, $preferred = array(), PropertyAccessorInterface $propertyAccessor = null)
8887
{
89-
$this->class = $class;
88+
$this->class = $class;
9089

91-
$queryClass = $this->class.'Query';
90+
$queryClass = $this->class.'Query';
9291
if (!class_exists($queryClass)) {
9392
if (empty($this->class)) {
9493
throw new MissingOptionsException('The "class" parameter is empty, you should provide the model class');
9594
}
9695
throw new InvalidOptionsException(sprintf('The query class "%s" is not found, you should provide the FQCN of the model class', $queryClass));
9796
}
9897

99-
$query = new $queryClass();
98+
$query = new $queryClass();
10099

101-
$this->query = $queryObject ?: $query;
102-
$this->identifier = $this->query->getTableMap()->getPrimaryKeys();
103-
$this->loaded = is_array($choices) || $choices instanceof \Traversable;
100+
$this->query = $queryObject ?: $query;
101+
$this->identifier = $this->query->getTableMap()->getPrimaryKeys();
102+
$this->loaded = is_array($choices) || $choices instanceof \Traversable;
104103

105104
if ($preferred instanceof ModelCriteria) {
106105
$this->preferredQuery = $preferred->mergeWith($this->query);

‎src/Symfony/Bridge/Propel1/Form/PropelTypeGuesser.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,22 @@ public function guessType($class, $property)
3838
if ($relation->getType() === \RelationMap::MANY_TO_ONE) {
3939
if (strtolower($property) === strtolower($relation->getName())) {
4040
return new TypeGuess('model', array(
41-
'class' => $relation->getForeignTable()->getClassName(),
41+
'class' => $relation->getForeignTable()->getClassName(),
4242
'multiple' => false,
4343
), Guess::HIGH_CONFIDENCE);
4444
}
4545
} elseif ($relation->getType() === \RelationMap::ONE_TO_MANY) {
4646
if (strtolower($property) === strtolower($relation->getPluralName())) {
4747
return new TypeGuess('model', array(
48-
'class' => $relation->getForeignTable()->getClassName(),
48+
'class' => $relation->getForeignTable()->getClassName(),
4949
'multiple' => true,
5050
), Guess::HIGH_CONFIDENCE);
5151
}
5252
} elseif ($relation->getType() === \RelationMap::MANY_TO_MANY) {
5353
if (strtolower($property) == strtolower($relation->getPluralName())) {
5454
return new TypeGuess('model', array(
55-
'class' => $relation->getLocalTable()->getClassName(),
56-
'multiple' => true,
55+
'class' => $relation->getLocalTable()->getClassName(),
56+
'multiple' => true,
5757
), Guess::HIGH_CONFIDENCE);
5858
}
5959
}

‎src/Symfony/Bridge/Propel1/Form/Type/ModelType.php

+10-10
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,16 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
8484
};
8585

8686
$resolver->setDefaults(array(
87-
'template' => 'choice',
88-
'multiple' => false,
89-
'expanded' => false,
90-
'class' => null,
91-
'property' => null,
92-
'query' => null,
93-
'choices' => null,
94-
'choice_list' => $choiceList,
95-
'group_by' => null,
96-
'by_reference' => false,
87+
'template' => 'choice',
88+
'multiple' => false,
89+
'expanded' => false,
90+
'class' => null,
91+
'property' => null,
92+
'query' => null,
93+
'choices' => null,
94+
'choice_list' => $choiceList,
95+
'group_by' => null,
96+
'by_reference' => false,
9797
));
9898
}
9999

‎src/Symfony/Bridge/Propel1/Logger/PropelLogger.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ class PropelLogger
4747
*/
4848
public function __construct(LoggerInterface $logger = null, Stopwatch $stopwatch = null)
4949
{
50-
$this->logger = $logger;
51-
$this->queries = array();
50+
$this->logger = $logger;
51+
$this->queries = array();
5252
$this->stopwatch = $stopwatch;
5353
$this->isPrepared = false;
5454
}

‎src/Symfony/Bridge/Propel1/Security/User/PropelUserProvider.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function __construct($class, $property = null)
6363
public function loadUserByUsername($username)
6464
{
6565
$queryClass = $this->queryClass;
66-
$query = $queryClass::create();
66+
$query = $queryClass::create();
6767

6868
if (null !== $this->property) {
6969
$filter = 'filterBy'.ucfirst($this->property);

‎src/Symfony/Bridge/Propel1/Tests/DataCollector/PropelDataCollectorTest.php

+12-12
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ public function testCollectWithData()
4545

4646
$this->assertEquals(array(
4747
array(
48-
'sql' => "SET NAMES 'utf8'",
49-
'time' => '0.000 sec',
48+
'sql' => "SET NAMES 'utf8'",
49+
'time' => '0.000 sec',
5050
'connection' => 'default',
51-
'memory' => '1.4 MB',
51+
'memory' => '1.4 MB',
5252
),
5353
), $c->getQueries());
5454
$this->assertEquals(1, $c->getQueryCount());
@@ -67,22 +67,22 @@ public function testCollectWithMultipleData()
6767

6868
$this->assertEquals(array(
6969
array(
70-
'sql' => "SET NAMES 'utf8'",
71-
'time' => '0.000 sec',
70+
'sql' => "SET NAMES 'utf8'",
71+
'time' => '0.000 sec',
7272
'connection' => 'default',
73-
'memory' => '1.4 MB',
73+
'memory' => '1.4 MB',
7474
),
7575
array(
76-
'sql' => "SELECT tags.NAME, image.FILENAME FROM tags LEFT JOIN image ON tags.IMAGEID = image.ID WHERE image.ID = 12",
77-
'time' => '0.012 sec',
76+
'sql' => "SELECT tags.NAME, image.FILENAME FROM tags LEFT JOIN image ON tags.IMAGEID = image.ID WHERE image.ID = 12",
77+
'time' => '0.012 sec',
7878
'connection' => 'default',
79-
'memory' => '2.4 MB',
79+
'memory' => '2.4 MB',
8080
),
8181
array(
82-
'sql' => "INSERT INTO `table` (`some_array`) VALUES ('| 1 | 2 | 3 |')",
83-
'time' => '0.012 sec',
82+
'sql' => "INSERT INTO `table` (`some_array`) VALUES ('| 1 | 2 | 3 |')",
83+
'time' => '0.012 sec',
8484
'connection' => 'default',
85-
'memory' => '2.4 MB',
85+
'memory' => '2.4 MB',
8686
),
8787
), $c->getQueries());
8888
$this->assertEquals(3, $c->getQueryCount());

‎src/Symfony/Bridge/Propel1/Tests/Fixtures/ItemQuery.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
class ItemQuery
1515
{
1616
private $map = array(
17-
'id' => \PropelColumnTypes::INTEGER,
18-
'value' => \PropelColumnTypes::VARCHAR,
19-
'price' => \PropelColumnTypes::FLOAT,
20-
'is_active' => \PropelColumnTypes::BOOLEAN,
21-
'enabled' => \PropelColumnTypes::BOOLEAN_EMU,
22-
'updated_at' => \PropelColumnTypes::TIMESTAMP,
17+
'id' => \PropelColumnTypes::INTEGER,
18+
'value' => \PropelColumnTypes::VARCHAR,
19+
'price' => \PropelColumnTypes::FLOAT,
20+
'is_active' => \PropelColumnTypes::BOOLEAN,
21+
'enabled' => \PropelColumnTypes::BOOLEAN_EMU,
22+
'updated_at' => \PropelColumnTypes::TIMESTAMP,
2323
);
2424

2525
public static $result = array();

0 commit comments

Comments
 (0)