symfony · canni · Dec 15, 2011 · Dec 15, 2011 · Dec 17, 2011 · Dec 17, 2011
diff --git a/src/Symfony/Component/Console/Output/ConsoleOutput.php b/src/Symfony/Component/Console/Output/ConsoleOutput.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Console\Output;
 
-use Symfony\Component\Console\Formatter\OutputFormatter;
+use Symfony\Component\Console\Formatter\OutputFormatterInterface;
 
 /**
  * ConsoleOutput is the default class for all CLI output. It uses STDOUT.
@@ -40,7 +40,7 @@ class ConsoleOutput extends StreamOutput
      *
      * @api
      */
-    public function __construct($verbosity = self::VERBOSITY_NORMAL, $decorated = null, OutputFormatter $formatter = null)
+    public function __construct($verbosity = self::VERBOSITY_NORMAL, $decorated = null, OutputFormatterInterface $formatter = null)
     {
         parent::__construct(fopen('php://stdout', 'w'), $verbosity, $decorated, $formatter);
     }

diff --git a/src/Symfony/Component/Console/Output/StreamOutput.php b/src/Symfony/Component/Console/Output/StreamOutput.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Console\Output;
 
-use Symfony\Component\Console\Formatter\OutputFormatter;
+use Symfony\Component\Console\Formatter\OutputFormatterInterface;
 
 /**
  * StreamOutput writes the output to a given stream.
@@ -45,7 +45,7 @@ class StreamOutput extends Output
      *
      * @api
      */
-    public function __construct($stream, $verbosity = self::VERBOSITY_NORMAL, $decorated = null, OutputFormatter $formatter = null)
+    public function __construct($stream, $verbosity = self::VERBOSITY_NORMAL, $decorated = null, OutputFormatterInterface $formatter = null)
     {
         if (!is_resource($stream) || 'stream' !== get_resource_type($stream)) {
             throw new \InvalidArgumentException('The StreamOutput class needs a stream as its first argument.');

diff --git a/src/Symfony/Component/HttpKernel/Client.php b/src/Symfony/Component/HttpKernel/Client.php
@@ -169,7 +169,7 @@ protected function filterResponse($response)
             foreach ($response->headers->getCookies() as $cookie) {
                 $cookies[] = new DomCookie($cookie->getName(), $cookie->getValue(), $cookie->getExpiresTime(), $cookie->getPath(), $cookie->getDomain(), $cookie->isSecure(), $cookie->isHttpOnly());
             }
-            $headers['Set-Cookie'] = implode(', ', $cookies);
+            $headers['Set-Cookie'] = $cookies;
         }
 
         return new DomResponse($response->getContent(), $response->getStatusCode(), $headers);

diff --git a/src/Symfony/Component/Locale/Stub/DateFormat/DayTransformer.php b/src/Symfony/Component/Locale/Stub/DateFormat/DayTransformer.php
@@ -31,13 +31,7 @@ public function format(\DateTime $dateTime, $length)
      */
     public function getReverseMatchingRegExp($length)
     {
-        if (1 == $length) {
-            $regExp = '\d{1,2}';
-        } else {
-            $regExp = '\d{'.$length.'}';
-        }
-
-        return $regExp;
+        return 1 === $length ? '\d{1,2}' : '\d{'.$length.'}';
     }
 
     /**

diff --git a/src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php b/src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php
@@ -116,11 +116,11 @@ public function formatReplace($dateChars, $dateTime)
             $transformer = $this->transformers[$dateChars[0]];
 
             return $transformer->format($dateTime, $length);
-        } else {
-            // handle unimplemented characters
-            if (false !== strpos($this->notImplementedChars, $dateChars[0])) {
-                throw new NotImplementedException(sprintf("Unimplemented date character '%s' in format '%s'", $dateChars[0], $this->pattern));
-            }
+        }
+
+        // handle unimplemented characters
+        if (false !== strpos($this->notImplementedChars, $dateChars[0])) {
+            throw new NotImplementedException(sprintf("Unimplemented date character '%s' in format '%s'", $dateChars[0], $this->pattern));
         }
     }
 
@@ -181,7 +181,6 @@ public function getReverseMatchingRegExp($pattern)
             }
 
             $transformers = $that->getTransformers();
-
             if (isset($transformers[$transformerIndex])) {
                 $transformer = $transformers[$transformerIndex];
                 $captureName = str_repeat($transformerIndex, $length);

diff --git a/src/Symfony/Component/Locale/Stub/DateFormat/Hour1200Transformer.php b/src/Symfony/Component/Locale/Stub/DateFormat/Hour1200Transformer.php
@@ -24,7 +24,7 @@ class Hour1200Transformer extends HourTransformer
     public function format(\DateTime $dateTime, $length)
     {
         $hourOfDay = $dateTime->format('g');
-        $hourOfDay = ('12' == $hourOfDay) ? '0' : $hourOfDay;
+        $hourOfDay = '12' == $hourOfDay ? '0' : $hourOfDay;
 
         return $this->padLeft($hourOfDay, $length);
     }

diff --git a/src/Symfony/Component/Locale/Stub/DateFormat/Hour1201Transformer.php b/src/Symfony/Component/Locale/Stub/DateFormat/Hour1201Transformer.php
@@ -35,7 +35,7 @@ public function normalizeHour($hour, $marker = null)
             $hour = 0;
         } elseif ('PM' === $marker && 12 !== $hour) {
             // If PM and hour is not 12 (1-12), sum 12 hour
-            $hour = $hour + 12;
+            $hour += 12;
         }
 
         return $hour;

diff --git a/src/Symfony/Component/Locale/Stub/DateFormat/Hour2401Transformer.php b/src/Symfony/Component/Locale/Stub/DateFormat/Hour2401Transformer.php
@@ -34,9 +34,7 @@ public function format(\DateTime $dateTime, $length)
      */
     public function normalizeHour($hour, $marker = null)
     {
-        if (null === $marker && 24 === $hour) {
-            $hour = 0;
-        } else if ('AM' == $marker) {
+        if ((null === $marker && 24 === $hour) || 'AM' == $marker) {
             $hour = 0;
         } else if ('PM' == $marker) {
             $hour = 12;

diff --git a/src/Symfony/Component/Locale/Stub/DateFormat/MinuteTransformer.php b/src/Symfony/Component/Locale/Stub/DateFormat/MinuteTransformer.php
@@ -33,13 +33,7 @@ public function format(\DateTime $dateTime, $length)
      */
     public function getReverseMatchingRegExp($length)
     {
-        if (1 == $length) {
-            $regExp = '\d{1,2}';
-        } else {
-            $regExp = '\d{'.$length.'}';
-        }
-
-        return $regExp;
+        return 1 === $length ? '\d{1,2}' : '\d{'.$length.'}';
     }
 
     /**

diff --git a/src/Symfony/Component/Locale/Stub/DateFormat/MonthTransformer.php b/src/Symfony/Component/Locale/Stub/DateFormat/MonthTransformer.php
@@ -60,7 +60,7 @@ class MonthTransformer extends Transformer
      */
     public function __construct()
     {
-        if (0 == count(self::$shortMonths)) {
+        if (0 === count(self::$shortMonths)) {
             self::$shortMonths = array_map(function($month) {
                 return substr($month, 0, 3);
             }, self::$months);
@@ -76,19 +76,21 @@ public function __construct()
     public function format(\DateTime $dateTime, $length)
     {
         $matchLengthMap = array(
-            1   => 'n',
-            2   => 'm',
-            3   => 'M',
-            4   => 'F',
+            1 => 'n',
+            2 => 'm',
+            3 => 'M',
+            4 => 'F',
         );
 
         if (isset($matchLengthMap[$length])) {
-           return $dateTime->format($matchLengthMap[$length]);
-        } else if (5 == $length) {
+            return $dateTime->format($matchLengthMap[$length]);
+        }
+
+        if (5 === $length) {
             return substr($dateTime->format('M'), 0, 1);
-        } else {
-            return $this->padLeft($dateTime->format('m'), $length);
         }
+
+        return $this->padLeft($dateTime->format('m'), $length);
     }
 
     /**
@@ -123,18 +125,15 @@ public function getReverseMatchingRegExp($length)
     public function extractDateOptions($matched, $length)
     {
            if (!is_numeric($matched)) {
-            if (3 == $length) {
+            if (3 === $length) {
                 $matched = self::$flippedShortMonths[$matched] + 1;
-            }
-            elseif (4 == $length) {
+            } elseif (4 === $length) {
                 $matched = self::$flippedMonths[$matched] + 1;
-            }
-            elseif (5 == $length) {
+            } elseif (5 === $length) {
                 // IntlDateFormatter::parse() always returns false for MMMMM or LLLLL
                 $matched = false;
             }
-        }
-        else {
+        } else {
             $matched = (int) $matched;
         }
 

diff --git a/src/Symfony/Component/Locale/Stub/DateFormat/SecondTransformer.php b/src/Symfony/Component/Locale/Stub/DateFormat/SecondTransformer.php
@@ -33,13 +33,7 @@ public function format(\DateTime $dateTime, $length)
      */
     public function getReverseMatchingRegExp($length)
     {
-        if (1 == $length) {
-            $regExp = '\d{1,2}';
-        } else {
-            $regExp = '\d{'.$length.'}';
-        }
-
-        return $regExp;
+        return 1 === $length ? '\d{1,2}' : '\d{'.$length.'}';
     }
 
     /**

diff --git a/src/Symfony/Component/Locale/Stub/DateFormat/YearTransformer.php b/src/Symfony/Component/Locale/Stub/DateFormat/YearTransformer.php
@@ -23,25 +23,19 @@ class YearTransformer extends Transformer
      */
     public function format(\DateTime $dateTime, $length)
     {
-        if (2 == $length) {
+        if (2 === $length) {
             return $dateTime->format('y');
-        } else {
-            return $this->padLeft($dateTime->format('Y'), $length);
         }
+
+        return $this->padLeft($dateTime->format('Y'), $length);
     }
 
     /**
      * {@inheritDoc}
      */
     public function getReverseMatchingRegExp($length)
     {
-        if (2 == $length) {
-            $regExp = '\d{2}';
-        } else {
-            $regExp = '\d{4}';
-        }
-
-        return $regExp;
+        return 2 === $length ? '\d{2}' : '\d{4}';
     }
 
     /**

diff --git a/src/Symfony/Component/Locale/Stub/StubIntl.php b/src/Symfony/Component/Locale/Stub/StubIntl.php
@@ -77,7 +77,7 @@ abstract class StubIntl
      */
     static public function isFailure($errorCode)
     {
-        return in_array($errorCode, static::$errorCodes, true)
+        return in_array($errorCode, self::$errorCodes, true)
             && $errorCode !== self::U_ZERO_ERROR;
     }
 
@@ -90,7 +90,7 @@ static public function isFailure($errorCode)
      */
     static public function getErrorCode()
     {
-        return static::$errorCode;
+        return self::$errorCode;
     }
 
     /**
@@ -102,7 +102,7 @@ static public function getErrorCode()
      */
     static public function getErrorMessage()
     {
-        return static::$errorMessages[static::$errorCode];
+        return self::$errorMessages[self::$errorCode];
     }
 
     /**
@@ -114,10 +114,10 @@ static public function getErrorMessage()
      */
     static public function setErrorCode($code)
     {
-        if (!isset(static::$errorMessages[$code])) {
+        if (!isset(self::$errorMessages[$code])) {
             throw new \InvalidArgumentException(sprintf('No such error code: "%s"', $code));
         }
 
-        static::$errorCode = $code;
+        self::$errorCode = $code;
     }
 }
diff --git a/src/Symfony/Component/Locale/Stub/StubLocale.php b/src/Symfony/Component/Locale/Stub/StubLocale.php
@@ -481,8 +481,7 @@ static public function setDefault($locale)
     static private function getStubData($locale, $cacheVariable, $stubDataDir)
     {
         if ('en' != $locale) {
-            $message = 'Only the \'en\' locale is supported. '.NotImplementedException::INTL_INSTALL_MESSAGE;
-            throw new \InvalidArgumentException($message);
+            throw new \InvalidArgumentException(sprintf('Only the \'en\' locale is supported. %s', NotImplementedException::INTL_INSTALL_MESSAGE));
         }
 
         if (empty(self::${$cacheVariable})) {

diff --git a/tests/Symfony/Tests/Component/HttpKernel/ClientTest.php b/tests/Symfony/Tests/Component/HttpKernel/ClientTest.php
@@ -66,16 +66,22 @@ public function testFilterResponseConvertsCookies()
         $m = $r->getMethod('filterResponse');
         $m->setAccessible(true);
 
+        $expected = array(
+            'foo=bar; expires=Sun, 15 Feb 2009 20:00:00 GMT; domain=http://example.com; path=/foo; secure; httponly',
+            'foo1=bar1; expires=Sun, 15 Feb 2009 20:00:00 GMT; domain=http://example.com; path=/foo; secure; httponly'
+        );
+
         $response = new Response();
         $response->headers->setCookie(new Cookie('foo', 'bar', \DateTime::createFromFormat('j-M-Y H:i:s T', '15-Feb-2009 20:00:00 GMT')->format('U'), '/foo', 'http://example.com', true, true));
         $domResponse = $m->invoke($client, $response);
-        $this->assertEquals('foo=bar; expires=Sun, 15 Feb 2009 20:00:00 GMT; domain=http://example.com; path=/foo; secure; httponly', $domResponse->getHeader('Set-Cookie'));
+        $this->assertEquals($expected[0], $domResponse->getHeader('Set-Cookie'));
 
         $response = new Response();
         $response->headers->setCookie(new Cookie('foo', 'bar', \DateTime::createFromFormat('j-M-Y H:i:s T', '15-Feb-2009 20:00:00 GMT')->format('U'), '/foo', 'http://example.com', true, true));
         $response->headers->setCookie(new Cookie('foo1', 'bar1', \DateTime::createFromFormat('j-M-Y H:i:s T', '15-Feb-2009 20:00:00 GMT')->format('U'), '/foo', 'http://example.com', true, true));
         $domResponse = $m->invoke($client, $response);
-        $this->assertEquals('foo=bar; expires=Sun, 15 Feb 2009 20:00:00 GMT; domain=http://example.com; path=/foo; secure; httponly, foo1=bar1; expires=Sun, 15 Feb 2009 20:00:00 GMT; domain=http://example.com; path=/foo; secure; httponly', $domResponse->getHeader('Set-Cookie'));
+        $this->assertEquals($expected[0], $domResponse->getHeader('Set-Cookie'));
+        $this->assertEquals($expected, $domResponse->getHeader('Set-Cookie', false));
     }
 
     public function testUploadedFile()