diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix CS in the whole Propel1 bridge

Browse Source
This commit is contained in:
William DURAND 2012-12-05 21:49:32 +01:00
parent 86ab4b345a
commit a3a832c2c1
6 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Symfony/Bridge/Propel1/DataCollector/PropelDataCollector.php
View File

@ -63,7 +63,7 @@ class PropelDataCollector extends DataCollector
/** /**
* Returns the collector name. * Returns the collector name.
* *
* @return string The collector name. * @return string The collector name.
*/ */
public function getName() public function getName()
{ {
@ -73,7 +73,7 @@ class PropelDataCollector extends DataCollector
/** /**
* Returns queries. * Returns queries.
* *
* @return array Queries * @return array Queries
*/ */
public function getQueries() public function getQueries()
{ {
@ -83,7 +83,7 @@ class PropelDataCollector extends DataCollector
/** /**
* Returns the query count. * Returns the query count.
* *
* @return int The query count * @return int The query count
*/ */
public function getQueryCount() public function getQueryCount()
{ {
@ -93,7 +93,7 @@ class PropelDataCollector extends DataCollector
/** /**
* Returns the total time of queries. * Returns the total time of queries.
* *
* @return float The total time of queries * @return float The total time of queries
*/ */
public function getTime() public function getTime()
{ {
@ -108,7 +108,7 @@ class PropelDataCollector extends DataCollector
/** /**
* Creates an array of Build objects. * Creates an array of Build objects.
* *
* @return array An array of Build objects * @return array An array of Build objects
*/ */
private function buildQueries() private function buildQueries()
{ {
@ -138,7 +138,7 @@ class PropelDataCollector extends DataCollector
/** /**
* Count queries. * Count queries.
* *
* @return int The number of queries. * @return int The number of queries.
*/ */
private function countQueries() private function countQueries()
{ {

6
src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
View File

@ -76,8 +76,7 @@ class ModelChoiceList extends ObjectChoiceList
$choices = array(); $choices = array();
} }
if ( 1 === count($this->identifier) if (1 === count($this->identifier) && $this->isInteger(current($this->identifier))) {
&& $this->isInteger(current($this->identifier))) {
$this->identifierAsIndex = true; $this->identifierAsIndex = true;
} }
@ -347,7 +346,8 @@ class ModelChoiceList extends ObjectChoiceList
* be persisted or added to the idmodel map before. Otherwise an * be persisted or added to the idmodel map before. Otherwise an
* exception is thrown. * exception is thrown.
* *
* @param object $model The model for which to get the identifier * @param object $model The model for which to get the identifier
*
* @throws FormException If the model does not exist * @throws FormException If the model does not exist
*/ */
private function getIdentifierValues($model) private function getIdentifierValues($model)

2
src/Symfony/Bridge/Propel1/Form/EventListener/TranslationCollectionFormListener.php
View File

@ -89,7 +89,7 @@ class TranslationCollectionFormListener implements EventSubscriberInterface
break; break;
} }
} }
if(!$foundData) { if (!$foundData) {
throw new UnexpectedTypeException($rootData, 'Propel i18n object'); throw new UnexpectedTypeException($rootData, 'Propel i18n object');
} }

2
src/Symfony/Bridge/Propel1/Logger/PropelLogger.php
View File

@ -161,7 +161,7 @@ class PropelLogger
/** /**
* Returns queries. * Returns queries.
* *
* @return array Queries * @return array Queries
*/ */
public function getQueries() public function getQueries()
{ {

3
src/Symfony/Bridge/Propel1/Tests/Fixtures/TranslatableItem.php
View File

@ -112,8 +112,7 @@ class TranslatableItem implements \Persistent
public function addTranslatableItemI18n(TranslatableItemI18n $i) public function addTranslatableItemI18n(TranslatableItemI18n $i)
{ {
if(!in_array($i, $this->currentTranslations)) if (!in_array($i, $this->currentTranslations)) {
{
$this->currentTranslations[$i->getLocale()] = $i; $this->currentTranslations[$i->getLocale()] = $i;
$i->setItem($this); $i->setItem($this);
} }

7
src/Symfony/Bridge/Propel1/Tests/Fixtures/TranslatableItemI18n.php
View File

@ -13,8 +13,8 @@ namespace Symfony\Bridge\Propel1\Tests\Fixtures;
use PropelPDO; use PropelPDO;
class TranslatableItemI18n implements \Persistent { class TranslatableItemI18n implements \Persistent
{
private $id; private $id;
private $locale; private $locale;
@ -100,7 +100,6 @@ class TranslatableItemI18n implements \Persistent {
public function getLocale() public function getLocale()
{ {
return $this->locale; return $this->locale;
} }
@ -122,7 +121,6 @@ class TranslatableItemI18n implements \Persistent {
public function getValue() public function getValue()
{ {
return $this->value; return $this->value;
} }
@ -134,7 +132,6 @@ class TranslatableItemI18n implements \Persistent {
public function getValue2() public function getValue2()
{ {
return $this->value2; return $this->value2;
} }
} }