From a5530c5d5458f004321d5d51359ea57a85ab557e Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Thu, 13 Dec 2012 23:51:22 +0100 Subject: [PATCH] [Propel1Bridge] Fix "and => &&" CS in ModelChoiceList --- src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php b/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php index 54fe224d31..4176777b37 100644 --- a/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php +++ b/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php @@ -345,7 +345,7 @@ class ModelChoiceList extends ObjectChoiceList } // readonly="true" models do not implement Persistent. - if ($model instanceof BaseObject and method_exists($model, 'getPrimaryKey')) { + if ($model instanceof BaseObject && method_exists($model, 'getPrimaryKey')) { return array($model->getPrimaryKey()); }