Permalink
Browse files

Merge branch '2.4'

* 2.4:
  fixed various inconsistencies
  reduced recursion when building DumperPrefixCollection
  renamed variables - making next change more readable
  removing dead code.
  [ExpressionLanguage] added some tests for the built-in constant() function
  [ExpressionLanguage] added some documentation about functions
  [DomCrawler] Fixed filterXPath() chaining
  [DomCrawler] Fixed incorrect handling of image inputs
  • Loading branch information...
fabpot committed Feb 11, 2014
2 parents 2999261 + bffad32 commit bd36afb306cb6cb0fda61883712bb730ebaf5b48
Showing with 3 additions and 1 deletion.
  1. +3 −1 StopwatchEvent.php
View
@@ -161,7 +161,9 @@ public function getStartTime()
*/
public function getEndTime()
{
- return ($count = count($this->periods)) ? $this->periods[$count - 1]->getEndTime() : 0;
+ $count = count($this->periods);
+
+ return $count ? $this->periods[$count - 1]->getEndTime() : 0;
}
/**

0 comments on commit bd36afb

Please sign in to comment.