CS: Unified non-strict equality comparisons, put var on the right side

Author: Seldaek

src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntityDoctrineCommand.php

@@ -112,7 +112,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
  $exporter->setEntityGenerator($this->getEntityGenerator());
  } else {
- $mappingType = $mappingType == 'yaml' ? 'yml' : $mappingType;
+ $mappingType = 'yaml' == $mappingType ? 'yml' : $mappingType;
  $path = $dirs[$namespace].'/'.$bundle.'/Resources/config/doctrine/metadata/orm/'.str_replace('\\', '.', $fullEntityClassName).'.dcm.'.$mappingType;
  }
 

src/Symfony/Component/CssSelector/Node/FunctionNode.php

@@ -177,7 +177,7 @@ protected function parseSeries($s)
  $s = $s->formatElement();
  }
 
- if (!$s || $s == '*') {
+ if (!$s || '*' == $s) {
  // Happens when there's nothing, which the CSS parser thinks of as *
  return array(0, 0);
  }
@@ -187,15 +187,15 @@ protected function parseSeries($s)
  return array(0, $s);
  }
 
- if ($s == 'odd') {
+ if ('odd' == $s) {
  return array(2, 1);
  }
 
- if ($s == 'even') {
+ if ('even' == $s) {
  return array(2, 0);
  }
 
- if ($s == 'n') {
+ if ('n' == $s) {
  return array(1, 0);
  }
 
@@ -208,15 +208,15 @@ protected function parseSeries($s)
  list($a, $b) = explode('n', $s);
  if (!$a) {
  $a = 1;
- } elseif ($a == '-' || $a == '+') {
+ } elseif ('-' == $a || '+' == $a) {
  $a = intval($a.'1');
  } else {
  $a = intval($a);
  }
 
  if (!$b) {
  $b = 0;
- } elseif ($b == '-' || $b == '+') {
+ } elseif ('-' == $b || '+' == $b) {
  $b = intval($b.'1');
  } else {
  $b = intval($b);

src/Symfony/Component/CssSelector/Parser.php

@@ -107,7 +107,7 @@ protected function parseSelector($stream)
 
  while (1) {
  $peek = $stream->peek();
- if ($peek == ',' || null === $peek) {
+ if (',' == $peek || null === $peek) {
  return $result;
  } elseif (in_array($peek, array('+', '>', '~'))) {
  // A combinator
@@ -133,19 +133,19 @@ protected function parseSelector($stream)
  protected function parseSimpleSelector($stream)
  {
  $peek = $stream->peek();
- if ($peek != '*' && !$peek->isType('Symbol')) {
+ if ('*' != $peek && !$peek->isType('Symbol')) {
  $element = $namespace = '*';
  } else {
  $next = $stream->next();
- if ($next != '*' && !$next->isType('Symbol')) {
+ if ('*' != $next && !$next->isType('Symbol')) {
  throw new SyntaxError(sprintf("Expected symbol, got '%s'", $next));
  }
 
  if ($stream->peek() == '|') {
  $namespace = $next;
  $stream->next();
  $element = $stream->next();
- if ($element != '*' && !$next->isType('Symbol')) {
+ if ('*' != $element && !$next->isType('Symbol')) {
  throw new SyntaxError(sprintf("Expected symbol, got '%s'", $next));
  }
  } else {
@@ -158,7 +158,7 @@ protected function parseSimpleSelector($stream)
  $has_hash = false;
  while (1) {
  $peek = $stream->peek();
- if ($peek == '#') {
+ if ('#' == $peek) {
  if ($has_hash) {
  /* You can't have two hashes
  (FIXME: is there some more general rule I'm missing?) */
@@ -171,21 +171,21 @@ protected function parseSimpleSelector($stream)
  $has_hash = true;
 
  continue;
- } elseif ($peek == '.') {
+ } elseif ('.' == $peek) {
  $stream->next();
  $result = new Node\ClassNode($result, $stream->next());
 
  continue;
- } elseif ($peek == '[') {
+ } elseif ('[' == $peek) {
  $stream->next();
  $result = $this->parseAttrib($result, $stream);
  $next = $stream->next();
- if ($next != ']') {
+ if (']' != $next) {
  throw new SyntaxError(sprintf("] expected, got '%s'", $next));
  }
 
  continue;
- } elseif ($peek == ':' || $peek == '::') {
+ } elseif (':' == $peek || '::' == $peek) {
  $type = $stream->next();
  $ident = $stream->next();
  if (!$ident || !$ident->isType('Symbol')) {
@@ -204,7 +204,7 @@ protected function parseSimpleSelector($stream)
  $selector = $this->parseSimpleSelector($stream);
  }
  $next = $stream->next();
- if ($next != ')') {
+ if (')' != $next) {
  throw new SyntaxError(sprintf("Expected ')', got '%s' and '%s'", $next, $selector));
  }
 
@@ -215,7 +215,7 @@ protected function parseSimpleSelector($stream)
 
  continue;
  } else {
- if ($peek == ' ') {
+ if (' ' == $peek) {
  $stream->next();
  }
 

src/Symfony/Component/CssSelector/XPathExpr.php

@@ -134,7 +134,7 @@ public function join($combiner, $other)
 
  /* We don't need a star prefix if we are joining to this other
  prefix; so we'll get rid of it */
- if ($other->hasStarPrefix() && $path == '*/') {
+ if ($other->hasStarPrefix() && '*/' == $path) {
  $path = '';
  }
  $this->prefix = $prefix;

src/Symfony/Component/Form/CollectionField.php

@@ -64,7 +64,7 @@ public function setData($collection)
  }
 
  foreach ($this as $name => $field) {
- if (!$this->getOption('modifiable') || $name != '$$key$$') {
+ if (!$this->getOption('modifiable') || '$$key$$' != $name) {
  $this->remove($name);
  }
  }
@@ -85,7 +85,7 @@ public function bind($taintedData)
  }
 
  foreach ($this as $name => $field) {
- if (!isset($taintedData[$name]) && $this->getOption('modifiable') && $name != '$$key$$') {
+ if (!isset($taintedData[$name]) && $this->getOption('modifiable') && '$$key$$' != $name) {
  $this->remove($name);
  $this->removedFields[] = $name;
  }

src/Symfony/Component/Form/TimezoneField.php

@@ -38,7 +38,7 @@ public function getDisplayedData()
  {
  $data = parent::getDisplayedData();
 
- if ($data == null && $this->isRequired()) {
+ if (null == $data && $this->isRequired()) {
  $data = date_default_timezone_get();
  }
 

src/Symfony/Component/Form/ValueTransformer/DateTimeToLocalizedStringTransformer.php

@@ -68,7 +68,7 @@ public function transform($dateTime)
  $inputTimezone = $this->getOption('input_timezone');
 
  // convert time to UTC before passing it to the formatter
- if ($inputTimezone != 'UTC') {
+ if ('UTC' != $inputTimezone) {
  $dateTime->setTimezone(new \DateTimeZone('UTC'));
  }
 
@@ -108,7 +108,7 @@ public function reverseTransform($value, $originalValue)
  // read timestamp into DateTime object - the formatter delivers in UTC
  $dateTime = new \DateTime(sprintf('@%s UTC', $timestamp));
 
- if ($inputTimezone != 'UTC') {
+ if ('UTC' != $inputTimezone) {
  $dateTime->setTimezone(new \DateTimeZone($inputTimezone));
  }
 

src/Symfony/Component/HttpFoundation/Request.php

@@ -401,7 +401,7 @@ public function getHttpHost()
  $name = $this->server->get('SERVER_NAME');
  $port = $this->getPort();
 
- if (($scheme == 'http' && $port == 80) || ($scheme == 'https' && $port == 443)) {
+ if (('http' == $scheme && $port == 80) || ('https' == $scheme && $port == 443)) {
  return $name;
  } else {
  return $name.':'.$port;

src/Symfony/Component/Translation/PluralizationRules.php

@@ -31,7 +31,7 @@ class PluralizationRules
  */
  static public function get($number, $locale)
  {
- if ($locale == "pt_BR") {
+ if ("pt_BR" == $locale) {
  // temporary set a locale for brasilian
  $locale = "xbr";
  }
@@ -197,7 +197,7 @@ static public function get($number, $locale)
  */
  static public function set($rule, $locale)
  {
- if ($locale == "pt_BR") {
+ if ("pt_BR" == $locale) {
  // temporary set a locale for brasilian
  $locale = "xbr";
  }

tests/Symfony/Tests/Component/Validator/Fixtures/ConstraintAValidator.php

@@ -9,7 +9,7 @@ class ConstraintAValidator extends ConstraintValidator
 {
  public function isValid($value, Constraint $constraint)
  {
- if ($value != 'VALID') {
+ if ('VALID' != $value) {
  $this->setMessage('message', array('param' => 'value'));
  return false;
  }