uppgrade 2.0.12 to 2.0.13

app/bootstrap.php.cache

@@ -456,7 +456,7 @@ abstract class Kernel implements KernelInterface
     protected $startTime;
     protected $classes;
 
-    const VERSION = '2.0.12';
+    const VERSION = '2.0.13';
 
     
     public function __construct($environment, $debug)

deps

@@ -1,10 +1,10 @@
 [symfony]
     git=http://github.com/symfony/symfony.git
-    version=v2.0.12
+    version=v2.0.13
 
 [twig]
     git=http://github.com/fabpot/Twig.git
-    version=v1.6.2
+    version=v1.7.0
 
 [monolog]
     git=http://github.com/Seldaek/monolog.git
@@ -24,7 +24,7 @@
 
 [swiftmailer]
     git=http://github.com/swiftmailer/swiftmailer.git
-    version=v4.1.5
+    version=v4.1.7
 
 [assetic]
     git=http://github.com/kriswallsmith/assetic.git

deps.lock

@@ -1,15 +1,15 @@
-symfony v2.0.12
-twig v1.6.2
+symfony v2.0.13
+twig v1.7.0
 monolog 1.0.2
 doctrine-common 2.1.4
 doctrine-dbal 2.1.6
 doctrine 2.1.6
-swiftmailer v4.1.5
+swiftmailer v4.1.7
 assetic v1.0.3
-twig-extensions 1dfff8e793f50f651c4f74f796c2c68a4aee3147
+twig-extensions 446d870272cd87a720e95242eade38a2acf56eaa
 metadata 1.0.0
-SensioFrameworkExtraBundle 638f545b7020b9e9d5944a7e3167f60ed848250d
-JMSSecurityExtraBundle 541a4c242328dc04b99540c75346cc74a7c0cfb5
+SensioFrameworkExtraBundle cb61b92ed55241d93ed9726bc3f5f47c7d2ce8fe
+JMSSecurityExtraBundle e752f888c51425f71382c056961f10f2be642102
 SensioDistributionBundle 20b66a408084ad8752f98e50f10533f5245310bf
 SensioGeneratorBundle b1ccb78c1743f30817b0fce9bb5c6baff6ed7bf8
 AsseticBundle v1.0.1

vendor/bundles/Sensio/Bundle/FrameworkExtraBundle/Request/ParamConverter/DoctrineParamConverter.php

@@ -91,6 +91,10 @@ class DoctrineParamConverter implements ParamConverterInterface
 
         $options = $this->getOptions($configuration);
 
+        if (false === isset($options['entity_manager'])) { 
+            return false; 
+        }
+
         // Doctrine Entity?
         try {
             $this->registry->getEntityManager($options['entity_manager'])->getClassMetadata($configuration->getClass());

vendor/swiftmailer/CHANGES

@@ -1,6 +1,16 @@
 Changelog since Version 4.1.x
 =============================
 
+4.1.7 (2012-04-26)
+------------------
+
+ * fixed QpEncoder safeMapShareId property
+
+4.1.6 (2012-03-23)
+------------------
+
+ * reduced the size of serialized Messages
+
 4.1.5 (2012-01-04)
 ------------------
 

vendor/swiftmailer/VERSION

@@ -1 +1 @@
-Swift-4.1.5
+Swift-4.1.7

vendor/swiftmailer/composer.json

@@ -4,7 +4,7 @@
     "description": "Swiftmailer, free feature-rich PHP mailer",
     "keywords": ["mail","mailer"],
     "homepage": "http://swiftmailer.org",
-    "version": "4.1.5",
+    "version": "4.1.7",
     "license": "LGPL",
     "authors": [
         {

vendor/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php

@@ -19,14 +19,13 @@
 class Swift_CharacterReader_GenericFixedWidthReader
   implements Swift_CharacterReader
 {
-   
   /**
    * The number of bytes in a single character.
    * @var int
    * @access private
    */
   private $_width;
-	
+
   /**
    * Creates a new GenericFixedWidthReader using $width bytes per character.
    * @param int $width
@@ -47,13 +46,13 @@ class Swift_CharacterReader_GenericFixedWidthReader
    */
   public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
   {
-  	$strlen = strlen($string);
-  	// % and / are CPU intensive, so, maybe find a better way
-  	$ignored = $strlen%$this->_width;
-  	$ignoredChars = substr($string, - $ignored);
-  	$currentMap = $this->_width;
-  	return ($strlen - $ignored)/$this->_width;
-  	
+    $strlen = strlen($string);
+    // % and / are CPU intensive, so, maybe find a better way
+    $ignored = $strlen%$this->_width;
+    $ignoredChars = substr($string, - $ignored);
+    $currentMap = $this->_width;
+
+    return ($strlen - $ignored)/$this->_width;
   }
   
   /**
@@ -62,7 +61,7 @@ class Swift_CharacterReader_GenericFixedWidthReader
    */
   public function getMapType()
   {
-  	return self::MAP_TYPE_FIXED_LEN;
+    return self::MAP_TYPE_FIXED_LEN;
   }
 
   /**
@@ -77,10 +76,8 @@ class Swift_CharacterReader_GenericFixedWidthReader
   public function validateByteSequence($bytes, $size)
   {
     $needed = $this->_width - $size;
-    return ($needed > -1)
-      ? $needed
-      : -1
-      ;
+
+    return ($needed > -1) ? $needed : -1;
   }
 
   /**
@@ -91,5 +88,4 @@ class Swift_CharacterReader_GenericFixedWidthReader
   {
     return $this->_width;
   }
-
 }

vendor/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php

@@ -27,16 +27,16 @@ class Swift_CharacterReader_UsAsciiReader
    */
   public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
   {
-  	$strlen=strlen($string);
-  	$ignoredChars='';
-  	for( $i = 0; $i < $strlen; ++$i)
-  	{
-  	  if ($string[$i]>"\x07F")
-  	  { // Invalid char
-  	  	$currentMap[$i+$startOffset]=$string[$i];
-  	  }
-  	}
-  	return $strlen;
+    $strlen=strlen($string);
+    $ignoredChars='';
+    for( $i = 0; $i < $strlen; ++$i)
+    {
+      if ($string[$i]>"\x07F")
+      { // Invalid char
+        $currentMap[$i+$startOffset]=$string[$i];
+      }
+    }
+    return $strlen;
   }
   
   /**
@@ -45,7 +45,7 @@ class Swift_CharacterReader_UsAsciiReader
    */
   public function getMapType()
   {
-  	return self::MAP_TYPE_INVALID;
+    return self::MAP_TYPE_INVALID;
   }
  
   /**

vendor/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php

@@ -85,40 +85,40 @@ class Swift_CharacterReader_Utf8Reader
    */
   public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
   {
-  	if (!isset($currentMap['i']) || !isset($currentMap['p']))
-  	{
-  	  $currentMap['p'] = $currentMap['i'] = array();
-   	}
-  	$strlen=strlen($string);
-  	$charPos=count($currentMap['p']);
-  	$foundChars=0;
-  	$invalid=false;
-  	for ($i=0; $i<$strlen; ++$i)
-  	{
-  	  $char=$string[$i];
-  	  $size=self::$s_length_map[$char];
-  	  if ($size==0)
-  	  {
-  	    /* char is invalid, we must wait for a resync */
-  	  	$invalid=true;
-  	  	continue;
-   	  }
-   	  else
-   	  {
-   	  	if ($invalid==true)
-   	  	{
-   	  	  /* We mark the chars as invalid and start a new char */
-   	  	  $currentMap['p'][$charPos+$foundChars]=$startOffset+$i;
-   	      $currentMap['i'][$charPos+$foundChars]=true;
-   	      ++$foundChars;
-   	      $invalid=false;
-   	  	}
-   	  	if (($i+$size) > $strlen){
-   	  		$ignoredChars=substr($string, $i);
-   	  		break;
-   	  	}
-   	  	for ($j=1; $j<$size; ++$j)
-   	  	{
+    if (!isset($currentMap['i']) || !isset($currentMap['p']))
+    {
+      $currentMap['p'] = $currentMap['i'] = array();
+     }
+    $strlen=strlen($string);
+    $charPos=count($currentMap['p']);
+    $foundChars=0;
+    $invalid=false;
+    for ($i=0; $i<$strlen; ++$i)
+    {
+      $char=$string[$i];
+      $size=self::$s_length_map[$char];
+      if ($size==0)
+      {
+        /* char is invalid, we must wait for a resync */
+        $invalid=true;
+        continue;
+       }
+       else
+       {
+         if ($invalid==true)
+         {
+           /* We mark the chars as invalid and start a new char */
+           $currentMap['p'][$charPos+$foundChars]=$startOffset+$i;
+           $currentMap['i'][$charPos+$foundChars]=true;
+           ++$foundChars;
+           $invalid=false;
+         }
+         if (($i+$size) > $strlen){
+           $ignoredChars=substr($string, $i);
+           break;
+         }
+         for ($j=1; $j<$size; ++$j)
+         {
           $char=$string[$i+$j];
           if ($char>"\x7F" && $char<"\xC0")
           {
@@ -130,14 +130,14 @@ class Swift_CharacterReader_Utf8Reader
             $invalid=true;
             continue 2;
           }
-   	  	}
-   	  	/* Ok we got a complete char here */
-   	  	$lastChar=$currentMap['p'][$charPos+$foundChars]=$startOffset+$i+$size;
-   	  	$i+=$j-1;
-   	    ++$foundChars;
-   	  }
-  	}
-  	return $foundChars;
+         }
+         /* Ok we got a complete char here */
+         $currentMap['p'][$charPos+$foundChars]=$startOffset+$i+$size;
+         $i+=$j-1;
+         ++$foundChars;
+       }
+    }
+    return $foundChars;
   }
   
   /**
@@ -146,7 +146,7 @@ class Swift_CharacterReader_Utf8Reader
    */
   public function getMapType()
   {
-  	return self::MAP_TYPE_POSITIONS;
+    return self::MAP_TYPE_POSITIONS;
   }
  
   /**

vendor/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php

@@ -24,20 +24,35 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactory
    * @var array
    * @access private
    */
-  private $_map = array();
+  private static $_map = array();
   
   /**
    * Factories which have already been loaded.
    * @var Swift_CharacterReaderFactory[]
    * @access private
    */
-  private $_loaded = array();
+  private static $_loaded = array();
   
   /**
    * Creates a new CharacterReaderFactory.
    */
   public function __construct()
   {
+    $this->init();
+  }
+
+  public function __wakeup()
+  {
+    $this->init();
+  }
+
+  public function init()
+  {
+    if(count(self::$_map) > 0)
+    {
+      return;
+    }
+    
     $prefix = 'Swift_CharacterReader_';
     
     $singleByte = array(
@@ -56,32 +71,32 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactory
       );
     
     //Utf-8
-    $this->_map['utf-?8'] = array(
+    self::$_map['utf-?8'] = array(
       'class' => $prefix . 'Utf8Reader',
       'constructor' => array()
       );
     
     //7-8 bit charsets
-    $this->_map['(us-)?ascii'] = $singleByte;
-    $this->_map['(iso|iec)-?8859-?[0-9]+'] = $singleByte;
-    $this->_map['windows-?125[0-9]'] = $singleByte;
-    $this->_map['cp-?[0-9]+'] = $singleByte;
-    $this->_map['ansi'] = $singleByte;
-    $this->_map['macintosh'] = $singleByte;
-    $this->_map['koi-?7'] = $singleByte;
-    $this->_map['koi-?8-?.+'] = $singleByte;
-    $this->_map['mik'] = $singleByte;
-    $this->_map['(cork|t1)'] = $singleByte;
-    $this->_map['v?iscii'] = $singleByte;
+    self::$_map['(us-)?ascii'] = $singleByte;
+    self::$_map['(iso|iec)-?8859-?[0-9]+'] = $singleByte;
+    self::$_map['windows-?125[0-9]'] = $singleByte;
+    self::$_map['cp-?[0-9]+'] = $singleByte;
+    self::$_map['ansi'] = $singleByte;
+    self::$_map['macintosh'] = $singleByte;
+    self::$_map['koi-?7'] = $singleByte;
+    self::$_map['koi-?8-?.+'] = $singleByte;
+    self::$_map['mik'] = $singleByte;
+    self::$_map['(cork|t1)'] = $singleByte;
+    self::$_map['v?iscii'] = $singleByte;
     
     //16 bits
-    $this->_map['(ucs-?2|utf-?16)'] = $doubleByte;
+    self::$_map['(ucs-?2|utf-?16)'] = $doubleByte;
     
     //32 bits
-    $this->_map['(ucs-?4|utf-?32)'] = $fourBytes;
+    self::$_map['(ucs-?4|utf-?32)'] = $fourBytes;
     
     //Fallback
-    $this->_map['.*'] = $singleByte;
+    self::$_map['.*'] = $singleByte;
   }
   
   /**
@@ -92,12 +107,12 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactory
   public function getReaderFor($charset)
   {
     $charset = trim(strtolower($charset));
-    foreach ($this->_map as $pattern => $spec)
+    foreach (self::$_map as $pattern => $spec)
     {
       $re = '/^' . $pattern . '$/D';
       if (preg_match($re, $charset))
       {
-        if (!array_key_exists($pattern, $this->_loaded))
+        if (!array_key_exists($pattern, self::$_loaded))
         {
           $reflector = new ReflectionClass($spec['class']);
           if ($reflector->getConstructor())
@@ -108,9 +123,9 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactory
           {
             $reader = $reflector->newInstance();
           }
-          $this->_loaded[$pattern] = $reader;
+          self::$_loaded[$pattern] = $reader;
         }
-        return $this->_loaded[$pattern];
+        return self::$_loaded[$pattern];
       }
     }
   }

vendor/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php

@@ -38,7 +38,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
    * @var string[]
    * @access protected
    */
-  protected $_qpMap = array(
+  protected static $_qpMap = array(
     0   => '=00', 1   => '=01', 2   => '=02', 3   => '=03', 4   => '=04',
     5   => '=05', 6   => '=06', 7   => '=07', 8   => '=08', 9   => '=09',
     10  => '=0A', 11  => '=0B', 12  => '=0C', 13  => '=0D', 14  => '=0E',
@@ -93,6 +93,8 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
     255 => '=FF'
     );
 
+  protected static $_safeMapShare = array();
+
   /**
    * A map of non-encoded ascii characters.
    * @var string[]
@@ -109,12 +111,48 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
     Swift_StreamFilter $filter = null)
   {
     $this->_charStream = $charStream;
+    if(!isset(self::$_safeMapShare[$this->getSafeMapShareId()]))
+    {
+      $this->initSafeMap();
+      self::$_safeMapShare[$this->getSafeMapShareId()] = $this->_safeMap;
+    }
+    else
+    {
+      $this->_safeMap = self::$_safeMapShare[$this->getSafeMapShareId()];
+    }
+    $this->_filter = $filter;
+  }
+
+  public function __sleep()
+  {
+    return array('_charStream', '_filter');
+  }
+
+  public function __wakeup()
+  {
+    if(!isset(self::$_safeMapShare[$this->getSafeMapShareId()]))
+    {
+      $this->initSafeMap();
+      self::$_safeMapShare[$this->getSafeMapShareId()] = $this->_safeMap;
+    }
+    else
+    {
+      $this->_safeMap = self::$_safeMapShare[$this->getSafeMapShareId()];
+    }
+  }
+
+  protected function getSafeMapShareId()
+  {
+    return get_class($this);
+  }
+
+  protected function initSafeMap()
+  {
     foreach (array_merge(
       array(0x09, 0x20), range(0x21, 0x3C), range(0x3E, 0x7E)) as $byte)
     {
       $this->_safeMap[$byte] = chr($byte);
     }
-    $this->_filter = $filter;
   }
 
   /**
@@ -217,7 +255,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
       }
       else
       {
-        $ret .= $this->_qpMap[$b];
+        $ret .= self::$_qpMap[$b];
         $size+=3;
       }
     }
@@ -250,7 +288,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
     {
       case 0x09:
       case 0x20:
-        $string = substr_replace($string, $this->_qpMap[$end], -1);
+        $string = substr_replace($string, self::$_qpMap[$end], -1);
     }
     return $string;
   }

vendor/swiftmailer/lib/classes/Swift/Events/SendEvent.php

@@ -37,12 +37,6 @@ class Swift_Events_SendEvent extends Swift_Events_EventObject
   private $_message;
   
   /**
-   * The Transport used in sending.
-   * @var Swift_Transport
-   */
-  private $_transport;
-  
-  /**
    * Any recipients which failed after sending.
    * @var string[]
    */
@@ -52,7 +46,7 @@ class Swift_Events_SendEvent extends Swift_Events_EventObject
    * The overall result as a bitmask from the class constants.
    * @var int
    */
-  private $result;
+  private $_result;
   
   /**
    * Create a new SendEvent for $source and $message.

vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php

@@ -19,6 +19,8 @@ class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder
   implements Swift_Mime_ContentEncoder
 {
 
+  protected $_dotEscape;
+
   /**
    * Creates a new QpContentEncoder for the given CharacterStream.
    * @param Swift_CharacterStream $charStream to use for reading characters
@@ -28,11 +30,27 @@ class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder
   public function __construct(Swift_CharacterStream $charStream,
     Swift_StreamFilter $filter = null, $dotEscape=false)
   {
+    $this->_dotEscape = $dotEscape;
     parent::__construct($charStream, $filter);
-    if ($dotEscape) {
+  }
+
+  public function __sleep()
+  {
+    return array('_charStream', '_filter', '_dotEscape');
+  }
+
+  protected function getSafeMapShareId()
+  {
+    return get_class($this).($this->_dotEscape ? '.dotEscape' : '');
+  }
+
+  protected function initSafeMap()
+  {
+    parent::initSafeMap();
+    if ($this->_dotEscape) {
       /* Encode . as =2e for buggy remote servers */
       unset($this->_safeMap[0x2e]);
-    }
+    }    
   }
 
   /**

vendor/swiftmailer/lib/classes/Swift/Mime/Grammar.php

@@ -22,14 +22,14 @@ class Swift_Mime_Grammar
    * @var string[]
    * @access private
    */
-  private $_specials = array();
+  private static $_specials = array();
 
   /**
    * Tokens defined in RFC 2822 (and some related RFCs).
    * @var string[]
    * @access private
    */
-  private $_grammar = array();
+  private static $_grammar = array();
   
   /**
    * Initialize some RFC 2822 (and friends) ABNF grammar definitions.
@@ -37,7 +37,22 @@ class Swift_Mime_Grammar
    */
   public function __construct()
   {
-    $this->_specials = array(
+    $this->init();
+  }
+
+  public function __wakeup()
+  {
+    $this->init();
+  }
+
+  protected function init()
+  {
+    if(count(self::$_specials) > 0)
+    {
+      return;
+    }
+
+    self::$_specials = array(
       '(', ')', '<', '>', '[', ']',
       ':', ';', '@', ',', '.', '"'
       );
@@ -45,65 +60,65 @@ class Swift_Mime_Grammar
     /*** Refer to RFC 2822 for ABNF grammar ***/
     
     //All basic building blocks
-    $this->_grammar['NO-WS-CTL'] = '[\x01-\x08\x0B\x0C\x0E-\x19\x7F]';
-    $this->_grammar['WSP'] = '[ \t]';
-    $this->_grammar['CRLF'] = '(?:\r\n)';
-    $this->_grammar['FWS'] = '(?:(?:' . $this->_grammar['WSP'] . '*' .
-        $this->_grammar['CRLF'] . ')?' . $this->_grammar['WSP'] . ')';
-    $this->_grammar['text'] = '[\x00-\x08\x0B\x0C\x0E-\x7F]';
-    $this->_grammar['quoted-pair'] = '(?:\\\\' . $this->_grammar['text'] . ')';
-    $this->_grammar['ctext'] = '(?:' . $this->_grammar['NO-WS-CTL'] .
+    self::$_grammar['NO-WS-CTL'] = '[\x01-\x08\x0B\x0C\x0E-\x19\x7F]';
+    self::$_grammar['WSP'] = '[ \t]';
+    self::$_grammar['CRLF'] = '(?:\r\n)';
+    self::$_grammar['FWS'] = '(?:(?:' . self::$_grammar['WSP'] . '*' .
+        self::$_grammar['CRLF'] . ')?' . self::$_grammar['WSP'] . ')';
+    self::$_grammar['text'] = '[\x00-\x08\x0B\x0C\x0E-\x7F]';
+    self::$_grammar['quoted-pair'] = '(?:\\\\' . self::$_grammar['text'] . ')';
+    self::$_grammar['ctext'] = '(?:' . self::$_grammar['NO-WS-CTL'] .
         '|[\x21-\x27\x2A-\x5B\x5D-\x7E])';
     //Uses recursive PCRE (?1) -- could be a weak point??
-    $this->_grammar['ccontent'] = '(?:' . $this->_grammar['ctext'] . '|' .
-        $this->_grammar['quoted-pair'] . '|(?1))';
-    $this->_grammar['comment'] = '(\((?:' . $this->_grammar['FWS'] . '|' .
-        $this->_grammar['ccontent']. ')*' . $this->_grammar['FWS'] . '?\))';
-    $this->_grammar['CFWS'] = '(?:(?:' . $this->_grammar['FWS'] . '?' .
-        $this->_grammar['comment'] . ')*(?:(?:' . $this->_grammar['FWS'] . '?' .
-        $this->_grammar['comment'] . ')|' . $this->_grammar['FWS'] . '))';
-    $this->_grammar['qtext'] = '(?:' . $this->_grammar['NO-WS-CTL'] .
+    self::$_grammar['ccontent'] = '(?:' . self::$_grammar['ctext'] . '|' .
+        self::$_grammar['quoted-pair'] . '|(?1))';
+    self::$_grammar['comment'] = '(\((?:' . self::$_grammar['FWS'] . '|' .
+        self::$_grammar['ccontent']. ')*' . self::$_grammar['FWS'] . '?\))';
+    self::$_grammar['CFWS'] = '(?:(?:' . self::$_grammar['FWS'] . '?' .
+        self::$_grammar['comment'] . ')*(?:(?:' . self::$_grammar['FWS'] . '?' .
+        self::$_grammar['comment'] . ')|' . self::$_grammar['FWS'] . '))';
+    self::$_grammar['qtext'] = '(?:' . self::$_grammar['NO-WS-CTL'] .
         '|[\x21\x23-\x5B\x5D-\x7E])';
-    $this->_grammar['qcontent'] = '(?:' . $this->_grammar['qtext'] . '|' .
-        $this->_grammar['quoted-pair'] . ')';
-    $this->_grammar['quoted-string'] = '(?:' . $this->_grammar['CFWS'] . '?"' .
-        '(' . $this->_grammar['FWS'] . '?' . $this->_grammar['qcontent'] . ')*' .
-        $this->_grammar['FWS'] . '?"' . $this->_grammar['CFWS'] . '?)';
-    $this->_grammar['atext'] = '[a-zA-Z0-9!#\$%&\'\*\+\-\/=\?\^_`\{\}\|~]';
-    $this->_grammar['atom'] = '(?:' . $this->_grammar['CFWS'] . '?' .
-        $this->_grammar['atext'] . '+' . $this->_grammar['CFWS'] . '?)';
-    $this->_grammar['dot-atom-text'] = '(?:' . $this->_grammar['atext'] . '+' .
-        '(\.' . $this->_grammar['atext'] . '+)*)';
-    $this->_grammar['dot-atom'] = '(?:' . $this->_grammar['CFWS'] . '?' .
-        $this->_grammar['dot-atom-text'] . '+' . $this->_grammar['CFWS'] . '?)';
-    $this->_grammar['word'] = '(?:' . $this->_grammar['atom'] . '|' .
-        $this->_grammar['quoted-string'] . ')';
-    $this->_grammar['phrase'] = '(?:' . $this->_grammar['word'] . '+?)';
-    $this->_grammar['no-fold-quote'] = '(?:"(?:' . $this->_grammar['qtext'] .
-        '|' . $this->_grammar['quoted-pair'] . ')*")';
-    $this->_grammar['dtext'] = '(?:' . $this->_grammar['NO-WS-CTL'] .
+    self::$_grammar['qcontent'] = '(?:' . self::$_grammar['qtext'] . '|' .
+        self::$_grammar['quoted-pair'] . ')';
+    self::$_grammar['quoted-string'] = '(?:' . self::$_grammar['CFWS'] . '?"' .
+        '(' . self::$_grammar['FWS'] . '?' . self::$_grammar['qcontent'] . ')*' .
+        self::$_grammar['FWS'] . '?"' . self::$_grammar['CFWS'] . '?)';
+    self::$_grammar['atext'] = '[a-zA-Z0-9!#\$%&\'\*\+\-\/=\?\^_`\{\}\|~]';
+    self::$_grammar['atom'] = '(?:' . self::$_grammar['CFWS'] . '?' .
+        self::$_grammar['atext'] . '+' . self::$_grammar['CFWS'] . '?)';
+    self::$_grammar['dot-atom-text'] = '(?:' . self::$_grammar['atext'] . '+' .
+        '(\.' . self::$_grammar['atext'] . '+)*)';
+    self::$_grammar['dot-atom'] = '(?:' . self::$_grammar['CFWS'] . '?' .
+        self::$_grammar['dot-atom-text'] . '+' . self::$_grammar['CFWS'] . '?)';
+    self::$_grammar['word'] = '(?:' . self::$_grammar['atom'] . '|' .
+        self::$_grammar['quoted-string'] . ')';
+    self::$_grammar['phrase'] = '(?:' . self::$_grammar['word'] . '+?)';
+    self::$_grammar['no-fold-quote'] = '(?:"(?:' . self::$_grammar['qtext'] .
+        '|' . self::$_grammar['quoted-pair'] . ')*")';
+    self::$_grammar['dtext'] = '(?:' . self::$_grammar['NO-WS-CTL'] .
         '|[\x21-\x5A\x5E-\x7E])';
-    $this->_grammar['no-fold-literal'] = '(?:\[(?:' . $this->_grammar['dtext'] .
-        '|' . $this->_grammar['quoted-pair'] . ')*\])';
+    self::$_grammar['no-fold-literal'] = '(?:\[(?:' . self::$_grammar['dtext'] .
+        '|' . self::$_grammar['quoted-pair'] . ')*\])';
     
     //Message IDs
-    $this->_grammar['id-left'] = '(?:' . $this->_grammar['dot-atom-text'] . '|' .
-        $this->_grammar['no-fold-quote'] . ')';
-    $this->_grammar['id-right'] = '(?:' . $this->_grammar['dot-atom-text'] . '|' .
-        $this->_grammar['no-fold-literal'] . ')';
+    self::$_grammar['id-left'] = '(?:' . self::$_grammar['dot-atom-text'] . '|' .
+        self::$_grammar['no-fold-quote'] . ')';
+    self::$_grammar['id-right'] = '(?:' . self::$_grammar['dot-atom-text'] . '|' .
+        self::$_grammar['no-fold-literal'] . ')';
     
     //Addresses, mailboxes and paths
-    $this->_grammar['local-part'] = '(?:' . $this->_grammar['dot-atom'] . '|' .
-        $this->_grammar['quoted-string'] . ')';
-    $this->_grammar['dcontent'] = '(?:' . $this->_grammar['dtext'] . '|' .
-        $this->_grammar['quoted-pair'] . ')';
-    $this->_grammar['domain-literal'] = '(?:' . $this->_grammar['CFWS'] . '?\[(' .
-        $this->_grammar['FWS'] . '?' . $this->_grammar['dcontent'] . ')*?' .
-        $this->_grammar['FWS'] . '?\]' . $this->_grammar['CFWS'] . '?)';
-    $this->_grammar['domain'] = '(?:' . $this->_grammar['dot-atom'] . '|' .
-        $this->_grammar['domain-literal'] . ')';
-    $this->_grammar['addr-spec'] = '(?:' . $this->_grammar['local-part'] . '@' .
-        $this->_grammar['domain'] . ')';
+    self::$_grammar['local-part'] = '(?:' . self::$_grammar['dot-atom'] . '|' .
+        self::$_grammar['quoted-string'] . ')';
+    self::$_grammar['dcontent'] = '(?:' . self::$_grammar['dtext'] . '|' .
+        self::$_grammar['quoted-pair'] . ')';
+    self::$_grammar['domain-literal'] = '(?:' . self::$_grammar['CFWS'] . '?\[(' .
+        self::$_grammar['FWS'] . '?' . self::$_grammar['dcontent'] . ')*?' .
+        self::$_grammar['FWS'] . '?\]' . self::$_grammar['CFWS'] . '?)';
+    self::$_grammar['domain'] = '(?:' . self::$_grammar['dot-atom'] . '|' .
+        self::$_grammar['domain-literal'] . ')';
+    self::$_grammar['addr-spec'] = '(?:' . self::$_grammar['local-part'] . '@' .
+        self::$_grammar['domain'] . ')';
   }
   
   /**
@@ -113,9 +128,9 @@ class Swift_Mime_Grammar
    */
   public function getDefinition($name)
   {
-    if (array_key_exists($name, $this->_grammar))
+    if (array_key_exists($name, self::$_grammar))
     {
-      return $this->_grammar[$name];
+      return self::$_grammar[$name];
     }
     else
     {
@@ -131,7 +146,7 @@ class Swift_Mime_Grammar
    */
   public function getGrammarDefinitions()
   {
-    return $this->_grammar;
+    return self::$_grammar;
   }
   
   /**
@@ -140,7 +155,7 @@ class Swift_Mime_Grammar
    */
   public function getSpecials()
   {
-    return $this->_specials;
+    return self::$_specials;
   }
   
   /**
@@ -154,7 +169,7 @@ class Swift_Mime_Grammar
     $exclude = array())
   {
     foreach (
-      array_merge(array('\\'), array_diff($this->_specials, $exclude), $include) as $char)
+      array_merge(array('\\'), array_diff(self::$_specials, $exclude), $include) as $char)
     {
       $token = str_replace($char, '\\' . $char, $token);
     }

vendor/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php

@@ -29,8 +29,10 @@ class Swift_Mime_HeaderEncoder_QpHeaderEncoder extends Swift_Encoder_QpEncoder
   public function __construct(Swift_CharacterStream $charStream)
   {
     parent::__construct($charStream);
-    // Reset the safeMap
-    $this->_safeMap=array();
+  }
+  
+  protected function initSafeMap()
+  {
     foreach (array_merge(
       range(0x61, 0x7A), range(0x41, 0x5A),
       range(0x30, 0x39), array(0x20, 0x21, 0x2A, 0x2B, 0x2D, 0x2F)

vendor/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php

@@ -439,9 +439,9 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
   
   /**
    * Generate a list of all tokens in the final header.
-   * @param string $string input, optional
-   * @return string[]
-   * @access private
+   * @param string $string The string to tokenize
+   * @return array An array of tokens as strings
+   * @access protected
    */
   protected function toTokens($string = null)
   {

vendor/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php

@@ -102,7 +102,7 @@ class Swift_Mime_Headers_IdentificationHeader
   {
     $actualIds = array();
     
-    foreach ($ids as $k => $id)
+    foreach ($ids as $id)
     {
       $this->_assertValidId($id);
       $actualIds[] = $id;

vendor/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php

@@ -21,6 +21,12 @@ class Swift_Mime_Headers_ParameterizedHeader
 {
   
   /**
+   * RFC 2231's definition of a token.
+   * @var string
+   */
+  const TOKEN_REGEX = '(?:[\x21\x23-\x27\x2A\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7E]+)';
+
+  /**
    * The Encoder used to encode the parameters.
    * @var Swift_Encoder
    * @access private
@@ -35,13 +41,6 @@ class Swift_Mime_Headers_ParameterizedHeader
   private $_params = array();
   
   /**
-   * RFC 2231's definition of a token.
-   * @var string
-   * @access private
-   */
-  private $_tokenRe;
-  
-  /**
    * Creates a new ParameterizedHeader with $name.
    * @param string $name
    * @param Swift_Mime_HeaderEncoder $encoder
@@ -53,7 +52,6 @@ class Swift_Mime_Headers_ParameterizedHeader
   {
     parent::__construct($name, $encoder, $grammar);
     $this->_paramEncoder = $paramEncoder;
-    $this->_tokenRe = '(?:[\x21\x23-\x27\x2A\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7E]+)';
   }
   
   /**
@@ -145,7 +143,8 @@ class Swift_Mime_Headers_ParameterizedHeader
    * Generate a list of all tokens in the final header.
    * This doesn't need to be overridden in theory, but it is for implementation
    * reasons to prevent potential breakage of attributes.
-   * @return string[]
+   * @param string $string The string to tokenize
+   * @return array An array of tokens as strings
    * @access protected
    */
   protected function toTokens($string = null)
@@ -187,7 +186,7 @@ class Swift_Mime_Headers_ParameterizedHeader
     $firstLineOffset = 0;
     
     //If it's not already a valid parameter value...
-    if (!preg_match('/^' . $this->_tokenRe . '$/D', $value))
+    if (!preg_match('/^' . self::TOKEN_REGEX . '$/D', $value))
     {
       //TODO: text, or something else??
       //... and it's not ascii
@@ -249,7 +248,7 @@ class Swift_Mime_Headers_ParameterizedHeader
    */
   private function _getEndOfParameterValue($value, $encoded = false, $firstLine = false)
   {
-    if (!preg_match('/^' . $this->_tokenRe . '$/D', $value))
+    if (!preg_match('/^' . self::TOKEN_REGEX . '$/D', $value))
     {
       $value = '"' . $value . '"';
     }

vendor/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php

@@ -26,7 +26,7 @@ class Swift_Plugins_DecoratorPlugin
   private $_replacements;
   
   /** The body as it was before replacements */
-  private $_orginalBody;
+  private $_originalBody;
 
   /** The original headers of the message, before replacements */
   private $_originalHeaders = array();
@@ -203,7 +203,6 @@ class Swift_Plugins_DecoratorPlugin
       {
         foreach ($message->getHeaders()->getAll() as $header)
         {
-          $body = $header->getFieldBodyModel();
           if (array_key_exists($header->getFieldName(), $this->_originalHeaders))
           {
             $header->setFieldBodyModel($this->_originalHeaders[$header->getFieldName()]);

vendor/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php

@@ -407,7 +407,7 @@ abstract class Swift_Transport_AbstractSmtpTransport
   /** Throws an Exception if a response code is incorrect */
   protected function _assertResponseCode($response, $wanted)
   {
-    list($code, $separator, $text) = sscanf($response, '%3d%[ -]%s');
+    list($code) = sscanf($response, '%3d');
     $valid = (empty($wanted) || in_array($code, $wanted));
     
     if ($evt = $this->_eventDispatcher->createResponseEvent($this, $response,

vendor/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php

@@ -53,7 +53,7 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
    * 
    * @return array Swift_Transport
    */
-  public function getTransports(array $transports)
+  public function getTransports()
   {
     return array_merge($this->_transports, $this->_deadTransports);
   }

vendor/swiftmailer/lib/preferences.php

@@ -9,9 +9,9 @@
 // Sets the default charset so that setCharset() is not needed elsewhere
 Swift_Preferences::getInstance()->setCharset('utf-8');
 
-// Without these lines the default caching mechanism is "array" but this uses
-// a lot of memory.
-// If possible, use a disk cache to enable attaching large attachments etc
+// Without these lines the default caching mechanism is "array" but this uses a lot of memory.
+// If possible, use a disk cache to enable attaching large attachments etc.
+// You can override the default temporary directory by setting the TMPDIR environment variable.
 if (function_exists('sys_get_temp_dir') && is_writable(sys_get_temp_dir()))
 {
   Swift_Preferences::getInstance()

vendor/symfony/CHANGELOG-2.0.md

@@ -7,6 +7,47 @@ in 2.0 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.0.0...v2.0.1
 
+* 2.0.13 (2012-04-30)
+
+ * 5b92b9e: [Console] Selectively output to STDOUT or OUTPUT stream
+ * c89f3d3: [HttpKernel] Added DEPRECATED errors
+ * 689a40d: [MonologBridge] Fixed the WebProcessor
+ * 2e7d3b1: http_build_query fix
+ * de73de0: http_build_query fix
+ * 3b7ee9a: http_build_query fix
+ * 14b3b05: [TwigBundle] added missing entry in the XSD schema
+ * 7ddc8cb: [FrameworkBundle] Monitor added/removed translations files in dev (fix #3653)
+ * 686653a: [HttpKernel] Fixed wache vary write (fixes #3896).
+ * 45ada32: Add Support for boolean as to string into yaml extension
+ * cd783fb: [HttpKernel] Fixed cache vary lookup (fixes #3896).
+ * 3939c90: [FrameworkBundle] Fix TraceableEventDispatcher unable to trace static class callables
+ * e4cbbf3: [Locale] fixed StubNumberFormatter::format() to behave like the NumberFormatter::parse() regarding to error flagging
+ * f16ff89: [Locale] fixed StubNumberFormatter::parse() to behave like the NumberFormatter::parse() regarding to error flagging
+ * 0a60664: [Locale] updated StubIntlDateFormatter::format() exception message when timestamp argument is an array for PHP >= 5.3.4
+ * 6f9c05d: [Locale] Complete Stub with intl_error_name
+ * 312a5a4: [Locale] fixed StubIntlDateFormatter::format() to set the right error for PHP >= 5.3.4 and to behave like the intl when formatting successfully
+ * bb61e09: [Locale] use the correct way for Intl error
+ * 01fcb08: [HttpKernel] Fix the ProfilerListener (fix #3620)
+ * 3ae826a: Fix issue #3251: Check attribute type of service tags
+ * 57dd914: [EventDispatcher] Fixed E_NOTICES with multiple eventnames per subscriber with mixed priorities
+ * 77185e0: [Routing] Allow spaces in the script name for the apache dumper
+ * 6465a69: [Routing] Fixes to handle spaces in route pattern
+ * 31dde14: [Locale] updated StubIntlDateFormatter::format() behavior for PHP >= 5.3.4
+ * 8a2b115: [Console] Mock terminal size to prevent formatting errors on small terminals
+ * 595cc11: [Console] Wrap exception messages to the terminal width to avoid ugly output
+ * 97f7b29: [Console] Avoid outputing \r's in exception messages
+ * 04ae7cc: [Routing] fixed exception message.
+ * f7647f9: [Routing] improved exception message when giving an invalid route name.
+ * 0024ddc: Fix for using route name as check_path.
+ * fc41d4f: [Security] [HttpDigest] Fixes a configuration error caused by an invalid 'key' child node configuration
+ * 24a0d0a: [DependencyInjection] Support Yaml calls without arguments
+ * 15dd17e: Simplified CONTENT_ headers retrieval
+ * 86a3512: [FrameworkBundle] Add support for full URLs to redirect controller
+ * 068e859: [TwigBundle] Changed getAndCleanOutputBuffering() handling of systems where ob_get_level() never returns 0
+ * efa807a: [HttpKernel] fixed sub-request which should be always a GET (refs #3657)
+ * c1206c3: [FrameworkBundle] Subrequests should always use GET method
+ * 0c9b2d4: use SecurityContextInterface instead of SecurityContext
+
 * 2.0.12 (2012-03-19)
 
  * 54b2413: Webprofiler ipv6 search fix

vendor/symfony/CONTRIBUTORS.md

@@ -6,258 +6,313 @@ Symfony2 is the result of the work of many people who made the code better
 
  - Fabien Potencier (fabpot)
  - Bernhard Schussek (bschussek)
- - Johannes (schmittjoh)
  - Victor Berchet (vicb)
- - Kris Wallsmith (kriswallsmith)
  - Jordi Boggiano (Seldaek)
+ - Johannes (schmittjoh)
+ - Kris Wallsmith (kriswallsmith)
  - Christophe Coevoet (stof)
+ - Drak (drak)
+ - Lukas Kahwe Smith (lsmith77)
  - Ryan Weaver (weaverryan)
+ - Jeremy Mikola (jmikola)
  - Pascal Borreli (pborreli)
- - Lukas Kahwe Smith (lsmith77)
  - Benjamin Eberlei (beberlei)
- - Jeremy Mikola (jmikola)
- - Igor Wiedler (igorw)
  - Joseph Bielawski (stloyd)
- - Drak (drak)
+ - Igor Wiedler (igorw)
  - Hugo Hamon (hhamon)
- - Jonathan H. Wage (jwage)
- - Thibault Duplessis (ornicar)
- - Alexandre Salomé (alexandresalome)
  - Eriksen Costa (eriksencosta)
- - Bulat Shakirzyanov (avalanche123)
+ - William DURAND (willdurand)
+ - Alexandre Salomé (alexandresalome)
  - stealth35 (stealth35)
- - Francis Besset (francisbesset)
- - Miha Vrhovnik (mvrhov)
- - Henrik Bjørnskov (henrikbjorn)
- - Martin Hasoň (hason)
- - Henrik Westphal (snc)
+ - Jonathan H. Wage (jwage)
+ - Thibault Duplessis (ornicar)
+ - Jakub Zalas (jakzal)
  - Eric Clemmons (ericclemmons)
- - Konstantin Kudryashov (everzet)
+ - Henrik Westphal (snc)
  - Dariusz Górecki (canni)
- - Arnout Boks (aboks)
- - William DURAND (willdurand)
+ - Miha Vrhovnik (mvrhov)
+ - Bulat Shakirzyanov (avalanche123)
+ - Martin Hasoň (hason)
+ - Henrik Bjørnskov (henrikbjorn)
+ - Francis Besset (francisbesset)
+ - Tobias Schultze (Tobion)
+ - Andrej Hudec (pulzarraider)
+ - Kevin Bond (kbond)
  - Deni (yethee)
+ - Arnout Boks (aboks)
+ - Jordan Alliot (jalliot)
+ - Marc Weistroff (marcw)
+ - Konstantin Kudryashov (everzet)
+ - Toni Uebernickel (havvg)
+ - Sebastian Hörl (blogsh)
+ - Excel Web Zone (excelwebzone)
  - Brandon Turner (blt04)
  - Hidenori Goto (hidenorigoto)
- - John Wards (johnwards)
- - Lenar Lõhmus (lenar)
- - Marc Weistroff (marcw)
  - Brikou CARRE (brikou)
+ - Lenar Lõhmus (lenar)
+ - John Wards (johnwards)
+ - Jean-François Simon (jfsimon)
  - Daniel Holmes (danielholmes)
+ - Tigran Azatyan (tigranazatyan)
  - Antoine Hérault (Herzult)
- - Fabien Pennequin (FabienPennequin)
- - Andrej Hudec (pulzarraider)
- - Sebastian Hörl (blogsh)
+ - Helmer Aaviksoo (helmer)
  - Jacob Dreesen (jdreesen)
+ - umpirsky (umpirsky)
+ - Pierre Minnieur (pminnieur)
+ - Michał Pipa (michal-pipa)
+ - Fabien Pennequin (FabienPennequin)
  - Richard Shank (IamPersistent)
- - Kevin Bond (kbond)
- - Jordan Alliot (jalliot)
- - Excel Web Zone (excelwebzone)
+ - Benjamin Dulau (benjamindulau)
+ - Christian Raue (craue)
+ - Grégoire Pineau (lyrixx)
  - Katsuhiro OGAWA (fivestar)
+ - Richard Miller (richardmiller)
  - Jeremy Mikola
- - Tobias Schultze (Tobion)
+ - Bart van den Burg (Burgov)
  - blue-eyes (blue-eyes)
+ - Juti Noppornpitak (shiroyuki)
  - Robert Schönthal (digitalkaoz)
+ - Florin Patan (dlsniper)
+ - Rafael Dohms (rdohms)
  - Tim Nagel (merk)
  - Michel Weimerskirch (mweimerskirch)
- - Tigran Azatyan (tigranazatyan)
- - Pierre Minnieur (pminnieur)
- - Christian Raue (craue)
- - umpirsky (umpirsky)
- - Helmer Aaviksoo (helmer)
- - Jakub Zalas (jakzal)
  - Javier Eguiluz (javiereguiluz)
+ - Joseph Rouff (rouffj)
+ - Marcel Beerta (mazen)
+ - Daniel Gomes
+ - Wotre (Wotre)
  - Matthieu Vachon (maoueh)
  - Amal Raghav (kertz)
  - Artur Kotyrba (udat)
- - Daniel Gomes (danielcsgomes)
+ - Gustavo Piltcher
+ - Rui Marinho
  - Clément JOBEILI (dator)
- - Bart van den Burg (Burgov)
- - Benjamin Dulau (benjamindulau)
+ - dbu
+ - Julien Brochet (aerialls)
+ - Thomas (rande)
+ - Alexander (asm89)
+ - Gordon Franke (gimler)
+ - Włodzimierz Gajda (gajdaw)
  - Noel GUILBERT (noelg)
+ - Alif Rachmawadi (subosito)
+ - Lars Strojny (lstrojny)
  - Martin Schuhfuss (usefulthink)
- - Thomas (rande)
  - Dennis Benkert (denderello)
  - Matthieu Bontemps (mbontemps)
+ - Jonathan Ingram (jonathaningram)
+ - Alessandro Desantis (alessandro1997)
+ - Oscar Cubo Medina (ocubom)
  - Dustin Whittle (dustinwhittle)
  - Jean-François PHILIPPE (jfphilippe)
+ - Arnaud Le Blanc (arnaud-lb)
  - Justin Hileman (bobthecow)
+ - Danny Berger (dpb587)
  - Sven Paulus (subsven)
  - Xavier Perez (DuoSRX)
  - Joel Wurtz (Brouznouf)
- - Alexander (asm89)
- - Jonathan Ingram (jonathaningram)
+ - Douglas Greenshields (shieldo)
+ - Joe Lencioni (lencioni)
+ - brki (brki)
  - Pablo Godel (pgodel)
  - Francois Zaninotto
  - Leszek Prabucki (l3l0)
  - Francois Zaninotto (fzaninotto)
+ - Gyula Sallai (thesalla)
  - Xavier Montaña Carreras (xmontana)
+ - Andreas Hucks (meandmymonkey)
  - Arjen Brouwer (arjenjb)
- - Alif Rachmawadi (subosito)
- - Florin Patan (dlsniper)
+ - Michael Holm (hollodk)
  - Boussekeyt Jules (gordonslondon)
  - Jan Sorgalla (jsor)
- - Marcel Beerta (mazen)
  - Lee McDermott (lmcd)
- - Toni Uebernickel (havvg)
- - Richard Miller (richardmiller)
+ - Manuel Reinhard (sprain)
  - Jeroen Hoek (jdhoek)
- - Rafael Dohms (rdohms)
+ - Ryan Rogers (timewasted)
+ - flevour (flevour)
+ - Michel Salib (michelsalib)
  - geoffrey
- - Wotre (Wotre)
- - Gyula Sallai (thesalla)
- - Grégoire Pineau (lyrixx)
- - Danny Berger (dpb587)
+ - Kim Hemsø Rasmussen (kimhemsoe)
+ - Gábor Egyed (1ed)
  - Jérémie Augustin (jaugustin)
- - Joseph Rouff (rouffj)
  - Manuel Kiessling (ManuelKiessling)
- - dbu
- - Julien Brochet (aerialls)
- - Douglas Greenshields (shieldo)
+ - Tobias Naumann (tna)
+ - Shein Alexey (conf)
  - Aurelijus Valeiša (aurelijus)
- - Gustavo Piltcher
  - Ray (rrehbeindoi)
- - Gordon Franke (gimler)
  - Adrian Rudnik (kreischweide)
- - Gábor Egyed (1ed)
+ - Marcin Chylek (SongoQ)
+ - Pavel Campr (pcampr)
+ - Josip Kruslin (aubx)
+ - drak3 (drak3)
+ - Chris Boden (cboden)
+ - Dustin Dobervich (dustin10)
+ - Michele Orselli (micheleorselli)
  - Andréia Bohner (andreia)
- - Andreas Hucks (meandmymonkey)
- - Drak
+ - Sebastian Bergmann (sebastianbergmann)
+ - Miquel Rodríguez Telep (mrtorrent)
+ - Peter Kokot (maastermedia)
  - Jérémy Romey (jeremyFreeAgent)
  - Yuen-Chi Lian (yclian)
+ - John Bohn (jjbohn)
  - Greg Thornton (xdissent)
- - Lars Strojny (lstrojny)
- - Arnaud Le Blanc (arnaud-lb)
+ - andrewtch (andrewtch)
  - Costin Bereveanu (schniper)
+ - Markus Lanthaler (lanthaler)
  - Konstantin Leboev (realmfoo)
- - Tobias Naumann (tna)
+ - Thomas Adam (tecbot)
+ - superjavason (superjavason)
  - Donald Tyler (Chekote)
  - Matthew Lewinski
  - Kai
  - Sergey Linnik (Partugal)
+ - Albert Jessurum (ajessu)
+ - Johnny Peck (johnnypeck)
  - Laszlo Korte (laszlokorte)
  - Hubert LECORCHE (hlecorche)
+ - Sergey Skopin (grizlik)
+ - drmonty (drmonty)
  - Michael Ridgway (mridgway)
  - Stepan Tanasiychuk (stfalcon)
- - Pavel Campr (pcampr)
  - Bertrand Zuchuat (Garfield-fr)
- - brki (brki)
- - Michel Salib (michelsalib)
+ - Bilal Amarni (bamarni)
  - Jan Schumann (janschumann)
- - Michele Orselli (micheleorselli)
+ - Olivier Dolbeau (odolbeau)
+ - Sebastian Marek (proofek)
  - Asier Illarramendi (doup)
  - Shigenobu Nishikawa (shishi)
- - Sebastian Bergmann (sebastianbergmann)
  - Marcin Sikoń (marphi)
- - Miquel Rodríguez Telep (mrtorrent)
- - Peter Kokot (maastermedia)
+ - cedric lombardot (cedriclombardot)
  - Laurent Bachelier (laurentb)
  - Fabian Lange (CodingFabian)
  - Yoshio HANAWA
  - Pablo Díez (pablodip)
- - ondrowan (ondrowan)
+ - Fran Moreno (franmomu)
+ - Manuel de Ruiter (ManuelAC)
+ - Ondrej Slinták (ondrowan)
+ - Crell (Crell)
  - Benoit Tirmarche (mcbennn)
  - Grégoire Passault
+ - Tom Klingenberg (ktomk)
+ - Daniel Gomes (danielcsgomes)
  - De Cock Xavier (xdecock)
  - Cristian González Sánchez (cristiangsp)
- - Manuel Reinhard (sprain)
- - Thomas Adam (tecbot)
  - Nils Adermann (naderman)
- - Shein Alexey (conf)
- - Steven Surowiec (steves)
- - Marcin Chylek (SongoQ)
+ - Steve Kondik (cyanogen)
+ - Benjamin Lévêque (benji07)
+ - Matt Robinson (inanimatt)
  - Ivan Rey (ivanrey)
- - Ryan Rogers (timewasted)
  - Ned Schwartz (theinterned)
+ - Ziumin (Ziumin)
  - Aurélien Fredouelle (AurelC2G)
- - flevour (flevour)
- - stealth35
- - Oscar Cubo Medina (ocubom)
- - IP_FIX (eversonfix)
+ - Marek Kalnik (marekkalnik)
+ - Tiago Ribeiro (fixe)
  - Geoffrey Tran (geoffreytran)
  - Christian Schaefer (caefer)
+ - Robert Gruendler (pulse00)
  - Elliot Anderson (elliot)
- - Olivier Dolbeau (odolbeau)
+ - xaav
+ - Anton Babenko (antonbabenko)
+ - Martin Hasoň
  - José Nahuel Cuesta Luengo (ncuesta)
- - Dustin Dobervich (dustin10)
  - Erkhembayar Gantulga (erheme318)
- - Michael Holm (hollodk)
  - Rostyslav Kinash
  - yktd26 (yktd26)
+ - Tom Van Looy (tvlooy)
  - umpirski (umpirski)
+ - Neil Katin
+ - Peter Kokot (peterkokot)
  - Hossein Bukhamsin (husinluck)
  - Fabrice Bernhard (fabriceb)
  - develop
  - Hiromi Hishida (77web)
+ - Klein Florian (docteurklein)
  - Joshua Nye (zerosanity)
- - andrewtch (andrewtch)
  - markchalloner (markchalloner)
+ - Mike Lively (mlively)
  - Michael Williams (mtotheikle)
+ - Thomas Chmielowiec (chmielot)
  - Casper Valdemar Poulsen (cvaldemar)
- - Fran Moreno (franmomu)
  - Degory Valentine
  - Krzysiek Łabuś (Crozin)
- - superjavason (superjavason)
+ - Ismael Ambrosi (iambrosi)
+ - Thomas Bibb (thomasbibb)
+ - Ivan Kurnosov
+ - stloyd
  - Jan Prieser (jaypea)
- - Tom Klingenberg (ktomk)
+ - Thomas Chmielowiec (chmielot)
+ - Grégoire Paris (greg0ire)
  - paulkamer (paulkamer)
  - Peter Kruithof (pkruithof)
- - Albert Jessurum (ajessu)
+ - alefranz (alefranz)
  - frost-nzcr4 (frost-nzcr4)
  - Petit Yoann (Abhoryo)
  - Fabian Vogler (fabian)
  - Maksim Kotlyar
+ - Artyom Protaskin (gatsu)
  - Grégoire Passault (Gregwar)
- - Manuel de Ruiter (ManuelAC)
+ - Alexander Miehe (Engerim)
  - Cyril Quintin (cyqui)
  - Gerard van Helden (drm)
- - Johnny Peck (johnnypeck)
  - kazusuke sasezaki (sasezaki)
- - Benjamin Lévêque (benji07)
- - Matt Robinson (inanimatt)
  - root
+ - Kirill chEbba Chebunin (chEbba)
+ - Julien DIDIER (juliendidier)
  - Chris Smith (cs278)
  - Derek ROTH (DerekRoth)
  - mwsaz
- - Sergey Skopin (grizlik)
+ - Giulio De Donato (liuggio)
+ - Matthias (mpdude)
  - Emil Einarsson (Einarsson)
  - Yanick Witschi (Toflar)
  - Don Pinkster
+ - Piotr Błasiak (blahy)
  - Saem Ghani (saem)
  - Michael Roterman (wtfzdotnet)
  - Arno Geurts
- - Marek Kalnik (marekkalnik)
+ - Jörg Rühl (LennyLinux)
+ - jeanfrancois.simon
+ - Bernd Matzner (bmatzner)
  - Daniel Cestari (dcestari)
- - Jérémy CROMBEZ (jcrombez)
+ - Jesse Cooke (jc00ke)
+ - jdewit (jdewit)
+ - Javier López (loalf)
  - Magnus Nordlander (magnusnordlander)
  - Adam Monsen (meonkeys)
- - Michał Pipa (michal-pipa)
- - Robert Gruendler (pulse00)
+ - nervo (nervo)
+ - Oleg Stepura (olegstepura)
+ - patrick-mcdougle (patrick-mcdougle)
  - Sebastian Busch (sbusch)
  - Benoît Merlet (trompette)
+ - xanido (xanido)
+ - Xavier HAUSHERR (xkobal)
+ - Craig Marvelley (craigmarvelley)
  - Jan Behrens (deegital)
+ - Hans (drublic)
+ - m0ppers (m0ppers)
+ - Michael Shtukin (mshtukin)
+ - Anthon Pang (robocoder)
+ - Teo (teo-sk)
+ - Tony Piper (tonypiper)
  - sensio
  - Théophile Helleboid - chtitux (chtitux)
  - Matthew Lewinski (lewinski)
- - xaav
- - Anton Babenko (antonbabenko)
+ - Markus Bachmann (Baachi)
  - irmantas (irmantas)
  - tero (tero)
- - Martin Hasoň
  - Vadim Tyukov (vatson)
  - Stainslav Turza (S0RIEN)
  - chispita
  - Tobias Sjösten (tobiassjosten)
  - Wojciech Sznapka (wowo)
- - Sebastian Marek (proofek)
- - cedric lombardot (cedriclombardot)
+ - julien.galenski
  - John Kary (johnkary)
  - Martijn Evers (martijn4evers)
  - Jeremy Bush (zombor)
+ - Evan Villemez (evillemez)
  - Davide Borsatto (davideborsatto)
  - kaiwa
- - Neil Katin
  - Gustavo Adrian
+ - Roger Webb
  - Nicolas Fabre (nfabre)
  - Clément Herreman (clemherreman)
  - heccjj (heccjj)
@@ -266,34 +321,29 @@ Symfony2 is the result of the work of many people who made the code better
  - George Giannoulopoulos (dotoree)
  - Alberto Pirovano (geezmo)
  - Xavier Briand (xavierbriand)
- - Markus Lanthaler (lanthaler)
- - Klein Florian (docteurklein)
+ - Carsten Nielsen (phreaknerd)
  - JerikVenture (JerikVenture)
  - Evan Kaufman (EvanK)
  - meckhardt (meckhardt)
- - Mike Lively (mlively)
  - Sebastian Ionescu
  - Dirk Pahl (dirkaholic)
+ - Konrad Mohrfeldt (kmohrf)
  - Nicolas Badey (Nico-B)
  - Philipp Scheit (pscheit)
  - Bouke Haarsma (Bouke)
  - Lars Strojny
  - Yrwein (Yrwein)
  - pborreli
- - Thomas Bibb (thomasbibb)
- - Ivan Kurnosov
- - stloyd
  - Martin Parsiegla
  - Christoph Nißle (DerStoffel)
  - Luis Muñoz
- - Thomas Chmielowiec (chmielot)
  - Oleg Zinchenko (cystbear)
- - Grégoire Paris (greg0ire)
  - Guilherme Blanco (guilhermeblanco)
  - Stefano Sala (stewe)
+ - Sebastian Hörl
  - Romain Dorgueil
  - Benjamin Zikarsky (bzikarsky)
- - alefranz (alefranz)
+ - pierre
  - Andy Stanberry (cranberyxl)
  - Alessio (ioalessio)
  - Jérôme Macias (jeromemacias)
@@ -301,19 +351,17 @@ Symfony2 is the result of the work of many people who made the code better
  - Gustavo Falco
  - gnat42 (gnat42)
  - Alexey Popkov (patashnik)
- - Alexander Miehe (Engerim)
  - devel
- - HIROKI (hirocaster)
+ - Hiroki HIROCASTER OHTSUKA (hirocaster)
  - jpauli (jpauli)
  - Kevin McBride (krmcbride)
  - Dan Patrick (mdpatrick)
+ - Drew Butler (nodrew)
  - Pierre-Yves LEBECQ (pylebecq)
  - Jan Eichhorn (Exeu)
  - Alexander Zogheb
- - Kirill chEbba Chebunin (chEbba)
  - cim-dch (cim-dch)
  - Dan Ordille (dordille)
- - Julien DIDIER (juliendidier)
  - Martin Mayer (martinmayer)
  - Baptiste Clavié (Taluu)
  - Tuxosaurus (Tuxosaurus)
@@ -324,30 +372,28 @@ Symfony2 is the result of the work of many people who made the code better
  - agilemedialab (agilemedialab)
  - Alan Chen (alan0101c)
  - Masao Maeda (brtriver)
+ - clemens-tolboom (clemens-tolboom)
  - Gustavo Falco (comfortablynumb)
  - Denis Klementjev (dklementjev)
  - Kévin Dunglas (dunglas)
  - Gabriel Birke (gbirke)
- - Ismael Ambrosi (iambrosi)
  - Osman Üngür (import)
  - Robert Campbell (jayrulez)
- - John Bohn (jjbohn)
  - Gábor Fási (maerlyn)
  - Matthew Davis (mdavis1982)
  - Matt Lehner (mlehner)
- - Matthias (mpdude)
  - Jimmy Leger (redpanda)
  - Nicolas A. Bérard-Nault
  - Alexey Popkov
  - Adán Lobato (adanlobato)
+ - Arnaud Buathier (arnapou)
  - chesteroni (chesteroni)
  - Elnur Abdurrakhimov (elnur)
  - Beau Simensen (simensen)
- - Tom Van Looy (tvlooy)
+ - Till Klampaeckel (till)
  - Juan Ases García (Ases)
  - Eugene Babushkin (EugeneBabushkin)
  - Fabien D. (FabienD)
- - Jörg Rühl (LennyLinux)
  - Matt Drollette (MDrollette)
  - Kornienko Alexander (Skorney)
  - Vincent (Vincent-P)
@@ -356,7 +402,6 @@ Symfony2 is the result of the work of many people who made the code better
  - Sébastien HOUZE
  - Sergiy Sokolenko
  - Adrien Brault (adrienbrault)
- - Bernd Matzner (bmatzner)
  - Vladimir Sazhin (cannie)
  - Chris Sedlmayr (catchamonkey)
  - Christian Stocker (chregu)
@@ -367,42 +412,35 @@ Symfony2 is the result of the work of many people who made the code better
  - ds (dantleech)
  - Djama Suemenich (djama)
  - Daniel Londero (dlondero)
- - Kyle W (dorkitude)
+ - Kyle Wild (dorkitude)
  - David Soria Parra (dsp)
  - Kousuke Ebihara (ebihara)
  - ideea (ideea)
- - John Carr (Jc2k)
- - jdewit (jdewit)
+ - Jérémy CROMBEZ (jcrombez)
+ - Johannes (johannes85)
  - Justin Rainbow (justinrainbow)
  - Abdulkadir N. A. (kadeer)
  - Krzysztof Menżyk (krymen)
  - kwiateusz (kwiateusz)
  - Samuel Laulhau (lalop)
- - Javier López (loalf)
  - Matt Fitzgerald (matthewfitz)
  - Penny Leach (mjollnir)
+ - Marc Abramowitz (msabramo)
  - Michael Schneider (mschneid)
  - Oncle Tom (oncletom)
  - ouardisoft (ouardisoft)
- - patrick-mcdougle (patrick-mcdougle)
  - Petr Jaroš (petajaros)
  - pzwosta (pzwosta)
+ - Julien 'ruian' Galenski (ruian)
  - Ruud Kamphuis (ruudk)
  - Markus Tacker (tacker)
  - Tyler Stroud (tystr)
  - Vyacheslav Slinko (vslinko)
  - Josiah (web-dev)
- - xanido (xanido)
- - Xavier HAUSHERR (xkobal)
- - drublic
  - Gustavo Adrian
  - max
- - Craig Marvelley (craigmarvelley)
- - m0ppers (m0ppers)
  - Muharrem Demirci (mdemirci)
  - meze (meze)
- - Michael Shtukin (mshtukin)
  - Nicolas de Marqué Fromentin (nicodmf)
  - Florent Cailhol (ooflorent)
  - Pierre (ptheg)
- - Teo (teo-sk)

vendor/symfony/composer.json

@@ -18,7 +18,7 @@
     "require": {
         "php": ">=5.3.2",
         "doctrine/common": "2.1.*",
-        "monolog/monolog": "1.0.*",
+        "monolog/monolog": ">=1.0,<1.2-dev",
         "swiftmailer/swiftmailer": ">=4.1.2,<4.2-dev",
         "twig/twig": ">=1.1,<2.0-dev"
     },

vendor/symfony/src/Symfony/Bridge/Monolog/Processor/WebProcessor.php

@@ -13,6 +13,8 @@ namespace Symfony\Bridge\Monolog\Processor;
 
 use Monolog\Processor\WebProcessor as BaseWebProcessor;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
  * WebProcessor override to read from the HttpFoundation's Request
@@ -21,8 +23,16 @@ use Symfony\Component\HttpFoundation\Request;
  */
 class WebProcessor extends BaseWebProcessor
 {
-    public function __construct(Request $request)
+    public function __construct()
     {
-        parent::__construct($request->server->all());
+        // Pass an empty array as the default null value would access $_SERVER
+        parent::__construct(array());
+    }
+
+    public function onKernelRequest(GetResponseEvent $event)
+    {
+        if (HttpKernelInterface::MASTER_REQUEST === $event->getRequestType()) {
+            $this->serverData = $event->getRequest()->server->all();
+        }
     }
 }

vendor/symfony/src/Symfony/Bridge/Twig/Extension/YamlExtension.php

@@ -52,7 +52,7 @@ class YamlExtension extends \Twig_Extension
             return '%'.gettype($value).'% '.$this->encode($value);
         }
 
-        return $value;
+        return $this->encode($value);
     }
 
     /**

vendor/symfony/src/Symfony/Bundle/DoctrineBundle/Registry.php

@@ -15,6 +15,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Bridge\Doctrine\RegistryInterface;
 use Doctrine\DBAL\Connection;
 use Doctrine\ORM\Configuration;
+use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\ORMException;
 
 /**
@@ -210,7 +212,7 @@ class Registry implements RegistryInterface
      * @param string $entityName        The name of the entity.
      * @param string $entityManagerName The entity manager name (null for the default one)
      *
-     * @return Doctrine\ORM\EntityRepository
+     * @return EntityRepository
      */
     public function getRepository($entityName, $entityManagerName = null)
     {

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php

@@ -70,6 +70,13 @@ class RedirectController extends ContainerAware
             return new Response(null, 410);
         }
 
+        $statusCode = $permanent ? 301 : 302;
+
+        // redirect if the path is a full URL
+        if (parse_url($path, PHP_URL_SCHEME)) {
+            return new RedirectResponse($path, $statusCode);
+        }
+
         $request = $this->container->get('request');
         if (null === $scheme) {
             $scheme = $request->getScheme();
@@ -89,6 +96,6 @@ class RedirectController extends ContainerAware
 
         $url = $scheme.'://'.$request->getHost().$port.$request->getBaseUrl().$path.$qs;
 
-        return new RedirectResponse($url, $permanent ? 301 : 302);
+        return new RedirectResponse($url, $statusCode);
     }
 }

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Debug/TraceableEventDispatcher.php

@@ -178,7 +178,7 @@ class TraceableEventDispatcher extends ContainerAwareEventDispatcher implements
             if (!is_array($listener)) {
                 $listener = array($listener, '__invoke');
             }
-            $class = get_class($listener[0]);
+            $class = is_object($listener[0]) ? get_class($listener[0]) : $listener[0];
             try {
                 $r = new \ReflectionMethod($class, $listener[1]);
                 $file = $r->getFileName();

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -17,6 +17,7 @@ use Symfony\Component\DependencyInjection\DefinitionDecorator;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\Config\Resource\FileResource;
+use Symfony\Component\Config\Resource\DirectoryResource;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\Config\FileLocator;
@@ -507,6 +508,9 @@ class FrameworkExtension extends Extension
 
             // Register translation resources
             if ($dirs) {
+                foreach ($dirs as $dir) {
+                    $container->addResource(new DirectoryResource($dir));
+                }
                 $finder = new Finder();
                 $finder->files()->filter(function (\SplFileInfo $file) {
                     return 2 === substr_count($file->getBasename(), '.') && preg_match('/\.\w+$/', $file->getBasename());

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php

@@ -140,6 +140,7 @@ class HttpKernel extends BaseHttpKernel
 
             $options['attributes']['_route'] = '_internal';
             $subRequest = $request->duplicate($options['query'], null, $options['attributes']);
+            $subRequest->setMethod('GET');
         }
 
         $level = ob_get_level();
@@ -189,14 +190,14 @@ class HttpKernel extends BaseHttpKernel
             return $controller;
         }
 
-        $path = http_build_query($attributes);
+        $path = http_build_query($attributes, '', '&');
         $uri = $this->container->get('router')->generate('_internal', array(
             'controller' => $controller,
             'path'       => $path ?: 'none',
             '_format'    => $this->container->get('request')->getRequestFormat(),
         ));
 
-        if ($queryString = http_build_query($query)) {
+        if ($queryString = http_build_query($query, '', '&')) {
             $uri .= '?'.$queryString;
         }
 

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.hr.xliff

@@ -0,0 +1,171 @@
+<?xml version="1.0"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+    <file source-language="en" datatype="plaintext" original="file.ext">
+        <body>
+            <trans-unit id="1">
+                <source>This value should be false</source>
+                <target>Ova vrijednost treba biti netočna</target>
+            </trans-unit>
+            <trans-unit id="2">
+                <source>This value should be true</source>
+                <target>Ova vrijednost treba biti točna</target>
+            </trans-unit>
+            <trans-unit id="3">
+                <source>This value should be of type {{ type }}</source>
+                <target>Ova vrijednost treba biti tipa {{ type }}</target>
+            </trans-unit>
+            <trans-unit id="4">
+                <source>This value should be blank</source>
+                <target>Ova vrijednost treba biti prazna</target>
+            </trans-unit>
+            <trans-unit id="5">
+                <source>The value you selected is not a valid choice</source>
+                <target>Ova vrijednost treba biti jedna od ponuđenih</target>
+            </trans-unit>
+            <trans-unit id="6">
+                <source>You must select at least {{ limit }} choices</source>
+                <target>Izaberite barem {{ limit }} mogućnosti</target>
+            </trans-unit>
+            <trans-unit id="7">
+                <source>You must select at most {{ limit }} choices</source>
+                <target>Izaberite najviše {{ limit }} mogućnosti</target>
+            </trans-unit>
+            <trans-unit id="8">
+                <source>One or more of the given values is invalid</source>
+                <target>Jedna ili više danih vrijednosti nije ispravna</target>
+            </trans-unit>
+            <trans-unit id="9">
+                <source>The fields {{ fields }} were not expected</source>
+                <target>Polja {{ fields }} nisu bila očekivana</target>
+            </trans-unit>
+            <trans-unit id="10">
+                <source>The fields {{ fields }} are missing</source>
+                <target>Polja {{ fields }} nedostaju</target>
+            </trans-unit>
+            <trans-unit id="11">
+                <source>This value is not a valid date</source>
+                <target>Ova vrijednost nije ispravan datum</target>
+            </trans-unit>
+            <trans-unit id="12">
+                <source>This value is not a valid datetime</source>
+                <target>Ova vrijednost nije ispravan datum-vrijeme</target>
+            </trans-unit>
+            <trans-unit id="13">
+                <source>This value is not a valid email address</source>
+                <target>Ova vrijednost nije ispravna e-mail adresa</target>
+            </trans-unit>
+            <trans-unit id="14">
+                <source>The file could not be found</source>
+                <target>Datoteka ne može biti pronađena</target>
+            </trans-unit>
+            <trans-unit id="15">
+                <source>The file is not readable</source>
+                <target>Datoteka nije čitljiva</target>
+            </trans-unit>
+            <trans-unit id="16">
+                <source>The file is too large ({{ size }}). Allowed maximum size is {{ limit }}</source>
+                <target>Datoteka je prevelika ({{ size }}). Najveća dozvoljena veličina je {{ limit }}</target>
+            </trans-unit>
+            <trans-unit id="17">
+                <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}</source>
+                <target>Mime tip datoteke nije ispravan ({{ type }}). Dozvoljeni mime tipovi su {{ types }}</target>
+            </trans-unit>
+            <trans-unit id="18">
+                <source>This value should be {{ limit }} or less</source>
+                <target>Ova vrijednost treba biti {{ limit }} ili manje</target>
+            </trans-unit>
+            <trans-unit id="19">
+                <source>This value is too long. It should have {{ limit }} characters or less</source>
+                <target>Ova vrijednost je predugačka. Treba imati {{ limit }} znakova ili manje</target>
+            </trans-unit>
+            <trans-unit id="20">
+                <source>This value should be {{ limit }} or more</source>
+                <target>Ova vrijednost treba biti {{ limit }} ili više</target>
+            </trans-unit>
+            <trans-unit id="21">
+                <source>This value is too short. It should have {{ limit }} characters or more</source>
+                <target>Ova vrijednost je prekratka. Treba imati {{ limit }} znakova ili više</target>
+            </trans-unit>
+            <trans-unit id="22">
+                <source>This value should not be blank</source>
+                <target>Ova vrijednost ne smije biti prazna</target>
+            </trans-unit>
+            <trans-unit id="23">
+                <source>This value should not be null</source>
+                <target>Ova vrijednost ne smije biti null</target>
+            </trans-unit>
+            <trans-unit id="24">
+                <source>This value should be null</source>
+                <target>Ova vrijednost treba biti null</target>
+            </trans-unit>
+            <trans-unit id="25">
+                <source>This value is not valid</source>
+                <target>Ova vrijednost nije ispravna</target>
+            </trans-unit>
+            <trans-unit id="26">
+                <source>This value is not a valid time</source>
+                <target>Ova vrijednost nije ispravno vrijeme</target>
+            </trans-unit>
+            <trans-unit id="27">
+                <source>This value is not a valid URL</source>
+                <target>Ova vrijednost nije ispravan URL</target>
+            </trans-unit>
+            <trans-unit id="28">
+                <source>This form should not contain extra fields</source>
+                <target>Ovaj obrazac ne smije sadržavati dodatna polja</target>
+            </trans-unit>
+            <trans-unit id="29">
+                <source>The uploaded file was too large. Please try to upload a smaller file</source>
+                <target>Prenesena datoteka je prevelika. Molim pokušajte prenijeti manju datoteku</target>
+            </trans-unit>
+            <trans-unit id="30">
+                <source>The CSRF token is invalid</source>
+                <target>CSRF vrijednost nije ispravna</target>
+            </trans-unit>
+            <trans-unit id="31">
+                <source>The two values should be equal</source>
+                <target>Obje vrijednosti trebaju biti jednake</target>
+            </trans-unit>
+            <trans-unit id="32">
+                <source>The file is too large. Allowed maximum size is {{ limit }}</source>
+                <target>Ova datoteka je prevelika. Najveća dozvoljena veličina je {{ limit }}</target>
+            </trans-unit>
+            <trans-unit id="33">
+                <source>The file is too large</source>
+                <target>Ova datoteka je prevelika</target>
+            </trans-unit>
+            <trans-unit id="34">
+                <source>The file could not be uploaded</source>
+                <target>Ova datoteka ne može biti prenesena</target>
+            </trans-unit>
+            <trans-unit id="35">
+                <source>This value should be a valid number</source>
+                <target>Ova vrijednost treba biti ispravan broj</target>
+            </trans-unit>
+            <trans-unit id="36">
+                <source>This file is not a valid image</source>
+                <target>Ova datoteka nije ispravna slika</target>
+            </trans-unit>
+            <trans-unit id="37">
+                <source>This is not a valid IP address</source>
+                <target>Ovo nije ispravna IP adresa</target>
+            </trans-unit>
+            <trans-unit id="38">
+                <source>This value is not a valid language</source>
+                <target>Ova vrijednost nije ispravan jezik</target>
+            </trans-unit>
+            <trans-unit id="39">
+                <source>This value is not a valid locale</source>
+                <target>Ova vrijednost nije ispravana regionalna oznaka</target>
+            </trans-unit>
+            <trans-unit id="40">
+                <source>This value is not a valid country</source>
+                <target>Ova vrijednost nije ispravna zemlja</target>
+            </trans-unit>
+            <trans-unit id="41">
+                <source>This value is already used</source>
+                <target>Ova vrijednost je već iskorištena</target>
+            </trans-unit>
+        </body>
+    </file>
+</xliff>

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.nl.xliff

@@ -24,7 +24,7 @@
             </trans-unit>
             <trans-unit id="6">
                 <source>You must select at least {{ limit }} choices</source>
-                <target>Selecteer tenminste {{ limit }} opties</target>
+                <target>Selecteer ten minste {{ limit }} opties</target>
             </trans-unit>
             <trans-unit id="7">
                 <source>You must select at most {{ limit }} choices</source>

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php

@@ -92,15 +92,22 @@ class RedirectControllerTest extends TestCase
 
     public function testEmptyPath()
     {
-        $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
-
         $controller = new RedirectController();
-        $controller->setContainer($container);
-
         $returnResponse = $controller->urlRedirectAction('');
 
         $this->assertInstanceOf('\Symfony\Component\HttpFoundation\Response', $returnResponse);
 
         $this->assertEquals(410, $returnResponse->getStatusCode());
     }
+
+    public function testFullURL()
+    {
+        $controller = new RedirectController();
+        $returnResponse = $controller->urlRedirectAction('http://foo.bar/');
+
+        $this->assertInstanceOf('\Symfony\Component\HttpFoundation\Response', $returnResponse);
+
+        $this->assertEquals('http://foo.bar/', $returnResponse->headers->get('Location'));
+        $this->assertEquals(302, $returnResponse->getStatusCode());
+    }
 }

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Debug/TraceableEventDispatcherTest.php

@@ -26,4 +26,26 @@ class TraceableEventDispatcherTest extends TestCase
         $dispatcher = new TraceableEventDispatcher($container);
         $dispatcher->addListener('onFooEvent', new \stdClass());
     }
+
+    public function testStaticCallable()
+    {
+        $container  = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+        $dispatcher = new TraceableEventDispatcher($container);
+
+        $dispatcher->addListener('onFooEvent', array(__NAMESPACE__.'\StaticClassFixture', 'staticListener'));
+
+        $dispatcher->dispatch('onFooEvent');
+
+        $this->assertTrue(StaticClassFixture::$called);
+    }
+}
+
+class StaticClassFixture
+{
+    static public $called = false;
+
+    static public function staticListener($event)
+    {
+        self::$called = true;
+    }
 }

vendor/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php

@@ -274,7 +274,7 @@ class MainConfiguration implements ConfigurationInterface
                             continue;
                         }
 
-                        if (!preg_match('#'.$firewall['pattern'].'#', $firewall[$k]['check_path'])) {
+                        if (false !== strpos('/', $firewall[$k]['check_path']) && !preg_match('#'.$firewall['pattern'].'#', $firewall[$k]['check_path'])) {
                             throw new \LogicException(sprintf('The check_path "%s" for login method "%s" is not matched by the firewall pattern "%s".', $firewall[$k]['check_path'], $k, $firewall['pattern']));
                         }
                     }

vendor/symfony/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpDigestFactory.php

@@ -62,7 +62,7 @@ class HttpDigestFactory implements SecurityFactoryInterface
             ->children()
                 ->scalarNode('provider')->end()
                 ->scalarNode('realm')->defaultValue('Secured Area')->end()
-                ->scalarNode('key')->cannotBeEmpty()->end()
+                ->scalarNode('key')->isRequired()->cannotBeEmpty()->end()
             ->end()
         ;
     }

vendor/symfony/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php

@@ -48,7 +48,7 @@ $container->loadFromExtension('security', array(
         'simple' => array('pattern' => '/login', 'security' => false),
         'secure' => array('stateless' => true,
             'http_basic' => true,
-            'http_digest' => true,
+            'http_digest' => array('key' => 'TheKey'),
             'form_login' => true,
             'anonymous' => true,
             'switch_user' => true,

vendor/symfony/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml

@@ -41,7 +41,7 @@
 
         <firewall name="secure" stateless="true">
             <http-basic />
-            <http-digest />
+            <http-digest key="TheKey" />
             <form-login />
             <anonymous />
             <switch-user />

vendor/symfony/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml

@@ -35,7 +35,8 @@ security:
         secure:
             stateless: true
             http_basic: true
-            http_digest: true
+            http_digest:
+                key: TheKey
             form_login: true
             anonymous: true
             switch_user: true

vendor/symfony/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php

@@ -61,13 +61,15 @@ class ExceptionController extends ContainerAware
 
     protected function getAndCleanOutputBuffering()
     {
-        // the count variable avoids an infinite loop on
-        // some Windows configurations where ob_get_level()
-        // never reaches 0
-        $count = 100;
+        // ob_get_level() never returns 0 on some Windows configurations, so if
+        // the level is the same two times in a row, the loop should be stopped.
+        $previousObLevel = null;
         $startObLevel = $this->container->get('request')->headers->get('X-Php-Ob-Level', -1);
+
         $currentContent = '';
-        while (ob_get_level() > $startObLevel && --$count) {
+
+        while (($obLevel = ob_get_level()) > $startObLevel && $obLevel !== $previousObLevel) {
+            $previousObLevel = $obLevel;
             $currentContent .= ob_get_clean();
         }
 

vendor/symfony/src/Symfony/Bundle/TwigBundle/Resources/config/schema/twig-1.0.xsd

@@ -20,6 +20,7 @@
         <xsd:attribute name="charset" type="xsd:string" />
         <xsd:attribute name="debug" type="xsd:string" />
         <xsd:attribute name="strict-variables" type="xsd:string" />
+        <xsd:attribute name="exception-controller" type="xsd:string" />
     </xsd:complexType>
 
     <xsd:complexType name="form">

vendor/symfony/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php

@@ -66,7 +66,7 @@ class TwigExtensionTest extends TestCase
 
         // Yaml and Php specific configs
         if (in_array($format, array('yml', 'php'))) {
-            $this->assertEquals('bad', $calls[2][1][0], '->load() registers variables as Twig globals');
+            $this->assertEquals('bad', $calls[2][1][0], '->load() registers variables as Twig globals');
             $this->assertEquals(array('key' => 'foo'), $calls[2][1][1], '->load() registers variables as Twig globals');
         }
 

vendor/symfony/src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php

@@ -84,6 +84,8 @@ class ApcUniversalClassLoader extends UniversalClassLoader
      * Finds a file by class name while caching lookups to APC.
      *
      * @param string $class A class name to resolve to file
+     *
+     * @return string|null The path, if found
      */
     public function findFile($class)
     {

vendor/symfony/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php

@@ -172,7 +172,7 @@ class ClassCollectionLoader
     /**
      * Writes a cache file.
      *
-     * @param string $file Filename
+     * @param string $file    Filename
      * @param string $content Temporary file content
      *
      * @throws \RuntimeException when a cache file cannot be written

vendor/symfony/src/Symfony/Component/ClassLoader/UniversalClassLoader.php

@@ -169,8 +169,8 @@ class UniversalClassLoader
     /**
      * Registers a set of classes using the PEAR naming convention.
      *
-     * @param string       $prefix  The classes prefix
-     * @param array|string $paths   The location(s) of the classes
+     * @param string       $prefix The classes prefix
+     * @param array|string $paths  The location(s) of the classes
      *
      * @api
      */

vendor/symfony/src/Symfony/Component/Console/Application.php

@@ -733,13 +733,16 @@ class Application
         do {
             $title = sprintf('  [%s]  ', get_class($e));
             $len = $strlen($title);
+            $width = $this->getTerminalWidth() ? $this->getTerminalWidth() - 1 : PHP_INT_MAX;
             $lines = array();
-            foreach (explode("\n", $e->getMessage()) as $line) {
-                $lines[] = sprintf('  %s  ', $line);
-                $len = max($strlen($line) + 4, $len);
+            foreach (preg_split("{\r?\n}", $e->getMessage()) as $line) {
+                foreach (str_split($line, $width - 4) as $line) {
+                    $lines[] = sprintf('  %s  ', $line);
+                    $len = max($strlen($line) + 4, $len);
+                }
             }
 
-            $messages = array(str_repeat(' ', $len), $title.str_repeat(' ', $len - $strlen($title)));
+            $messages = array(str_repeat(' ', $len), $title.str_repeat(' ', max(0, $len - $strlen($title))));
 
             foreach ($lines as $line) {
                 $messages[] = $line.str_repeat(' ', $len - $strlen($line));
@@ -787,6 +790,38 @@ class Application
     }
 
     /**
+     * Tries to figure out the terminal width in which this application runs
+     *
+     * @return int|null
+     */
+    protected function getTerminalWidth()
+    {
+        if (defined('PHP_WINDOWS_VERSION_BUILD') && $ansicon = getenv('ANSICON')) {
+            return preg_replace('{^(\d+)x.*$}', '$1', $ansicon);
+        }
+
+        if (preg_match("{rows.(\d+);.columns.(\d+);}i", exec('stty -a | grep columns'), $match)) {
+            return $match[1];
+        }
+    }
+
+    /**
+     * Tries to figure out the terminal height in which this application runs
+     *
+     * @return int|null
+     */
+    protected function getTerminalHeight()
+    {
+        if (defined('PHP_WINDOWS_VERSION_BUILD') && $ansicon = getenv('ANSICON')) {
+            return preg_replace('{^\d+x\d+ \(\d+x(\d+)\)$}', '$1', trim($ansicon));
+        }
+
+        if (preg_match("{rows.(\d+);.columns.(\d+);}i", exec('stty -a | grep columns'), $match)) {
+            return $match[2];
+        }
+    }
+
+    /**
      * Gets the name of the command based on input.
      *
      * @param InputInterface $input The input interface

vendor/symfony/src/Symfony/Component/Console/Output/ConsoleOutput.php

@@ -42,6 +42,26 @@ class ConsoleOutput extends StreamOutput
      */
     public function __construct($verbosity = self::VERBOSITY_NORMAL, $decorated = null, OutputFormatterInterface $formatter = null)
     {
-        parent::__construct(fopen('php://stdout', 'w'), $verbosity, $decorated, $formatter);
+        $outputStream = 'php://stdout';
+        if (!$this->hasStdoutSupport()) {
+            $outputStream = 'php://output';
+        }
+
+        parent::__construct(fopen($outputStream, 'w'), $verbosity, $decorated, $formatter);
+    }
+
+    /**
+     * Returns true if current environment supports writing console output to
+     * STDOUT.
+     *
+     * IBM iSeries (OS400) exhibits character-encoding issues when writing to
+     * STDOUT and doesn't properly convert ASCII to EBCDIC, resulting in garbage
+     * output.
+     *
+     * @return boolean
+     */
+    protected function hasStdoutSupport()
+    {
+        return ('OS400' != php_uname('s'));
     }
 }

vendor/symfony/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php

@@ -16,6 +16,7 @@ use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Yaml\Yaml;
 
@@ -198,23 +199,30 @@ class YamlFileLoader extends FileLoader
 
         if (isset($service['calls'])) {
             foreach ($service['calls'] as $call) {
-                $definition->addMethodCall($call[0], $this->resolveServices($call[1]));
+                $args = isset($call[1]) ? $this->resolveServices($call[1]) : array();
+                $definition->addMethodCall($call[0], $args);
             }
         }
 
         if (isset($service['tags'])) {
             if (!is_array($service['tags'])) {
-                throw new \InvalidArgumentException(sprintf('Parameter "tags" must be an array for service "%s" in %s.', $id, $file));
+                throw new InvalidArgumentException(sprintf('Parameter "tags" must be an array for service "%s" in %s.', $id, $file));
             }
 
             foreach ($service['tags'] as $tag) {
                 if (!isset($tag['name'])) {
-                    throw new \InvalidArgumentException(sprintf('A "tags" entry is missing a "name" key for service "%s" in %s.', $id, $file));
+                    throw new InvalidArgumentException(sprintf('A "tags" entry is missing a "name" key for service "%s" in %s.', $id, $file));
                 }
 
                 $name = $tag['name'];
                 unset($tag['name']);
 
+                foreach ($tag as $attribute => $value) {
+                    if (!is_scalar($value)) {
+                        throw new InvalidArgumentException(sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s" in %s.', $id, $name, $file));
+                    }
+                }
+
                 $definition->addTag($name, $tag);
             }
         }

vendor/symfony/src/Symfony/Component/DomCrawler/Crawler.php

@@ -22,6 +22,9 @@ use Symfony\Component\CssSelector\CssSelector;
  */
 class Crawler extends \SplObjectStorage
 {
+    /**
+     * @var string The current URI or the base href value
+     */
     private $uri;
 
     /**
@@ -75,8 +78,10 @@ class Crawler extends \SplObjectStorage
     /**
      * Adds HTML/XML content.
      *
-     * @param string $content A string to parse as HTML/XML
-     * @param string $type    The content type of the string
+     * @param string      $content A string to parse as HTML/XML
+     * @param null|string $type    The content type of the string
+     *
+     * @return null|void
      */
     public function addContent($content, $type = null)
     {
@@ -208,7 +213,7 @@ class Crawler extends \SplObjectStorage
      *
      * @param integer $position The position
      *
-     * @return A new instance of the Crawler with the selected node, or an empty Crawler if it does not exist.
+     * @return Crawler A new instance of the Crawler with the selected node, or an empty Crawler if it does not exist.
      *
      * @api
      */
@@ -518,7 +523,7 @@ class Crawler extends \SplObjectStorage
     /**
      * Selects links by name or alt value for clickable images.
      *
-     * @param  string $value The link text
+     * @param string $value The link text
      *
      * @return Crawler A new instance of Crawler with the filtered list of nodes
      *
@@ -535,7 +540,7 @@ class Crawler extends \SplObjectStorage
     /**
      * Selects a button by name or alt value for images.
      *
-     * @param  string $value The button text
+     * @param string $value The button text
      *
      * @return Crawler A new instance of Crawler with the filtered list of nodes
      *
@@ -553,7 +558,7 @@ class Crawler extends \SplObjectStorage
     /**
      * Returns a Link object for the first node in the list.
      *
-     * @param  string $method The method for the link (get by default)
+     * @param string $method The method for the link (get by default)
      *
      * @return Link   A Link instance
      *
@@ -592,8 +597,8 @@ class Crawler extends \SplObjectStorage
     /**
      * Returns a Form object for the first node in the list.
      *
-     * @param  array  $values An array of values for the form fields
-     * @param  string $method The method for the form
+     * @param array  $values An array of values for the form fields
+     * @param string $method The method for the form
      *
      * @return Form   A Form instance
      *
@@ -616,6 +621,28 @@ class Crawler extends \SplObjectStorage
         return $form;
     }
 
+    /**
+     * Converts string for XPath expressions.
+     *
+     * Escaped characters are: quotes (") and apostrophe (').
+     *
+     *  Examples:
+     *  <code>
+     *     echo Crawler::xpathLiteral('foo " bar');
+     *     //prints 'foo " bar'
+     *
+     *     echo Crawler::xpathLiteral("foo ' bar");
+     *     //prints "foo ' bar"
+     *
+     *     echo Crawler::xpathLiteral('a\'b"c');
+     *     //prints concat('a', "'", 'b"c')
+     *  </code>
+     *
+     * @param string $s String to be escaped
+     *
+     * @return string Converted string
+     *
+     */
     static public function xpathLiteral($s)
     {
         if (false === strpos($s, "'")) {

vendor/symfony/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php

@@ -22,8 +22,17 @@ namespace Symfony\Component\DomCrawler\Field;
  */
 class ChoiceFormField extends FormField
 {
+    /**
+     * @var string
+     */
     private $type;
+    /**
+     * @var Boolean
+     */
     private $multiple;
+    /**
+     * @var array
+     */
     private $options;
 
     /**
@@ -44,7 +53,7 @@ class ChoiceFormField extends FormField
     /**
      * Check if the current selected option is disabled
      *
-     * @return bool
+     * @return Boolean
      */
     public function isDisabled()
     {
@@ -62,8 +71,6 @@ class ChoiceFormField extends FormField
      *
      * @param string $value The value of the field
      *
-     * @throws \InvalidArgumentException When value type provided is not correct
-     *
      * @api
      */
     public function select($value)
@@ -74,7 +81,7 @@ class ChoiceFormField extends FormField
     /**
      * Ticks a checkbox.
      *
-     * @throws \InvalidArgumentException When value type provided is not correct
+     * @throws \LogicException When the type provided is not correct
      *
      * @api
      */
@@ -90,7 +97,7 @@ class ChoiceFormField extends FormField
     /**
      * Ticks a checkbox.
      *
-     * @throws \InvalidArgumentException When value type provided is not correct
+     * @throws \LogicException When the type provided is not correct
      *
      * @api
      */
@@ -248,7 +255,7 @@ class ChoiceFormField extends FormField
     /**
      * Returns option value with associated disabled flag
      *
-     * @param type $node
+     * @param \DOMNode $node
      *
      * @return array
      */

vendor/symfony/src/Symfony/Component/DomCrawler/Field/FormField.php

@@ -18,11 +18,29 @@ namespace Symfony\Component\DomCrawler\Field;
  */
 abstract class FormField
 {
+    /**
+     * @var \DOMNode
+     */
     protected $node;
+    /**
+     * @var string
+     */
     protected $name;
+    /**
+     * @var string
+     */
     protected $value;
+    /**
+     * @var \DOMDocument
+     */
     protected $document;
+    /**
+     * @var \DOMXPath
+     */
     protected $xpath;
+    /**
+     * @var Boolean
+     */
     protected $disabled;
 
     /**
@@ -87,6 +105,11 @@ abstract class FormField
         return true;
     }
 
+    /**
+     * Check if the current field is disabled
+     *
+     * @return Boolean
+     */
     public function isDisabled()
     {
         return $this->node->hasAttribute('disabled');

vendor/symfony/src/Symfony/Component/DomCrawler/Form.php

@@ -22,7 +22,13 @@ use Symfony\Component\DomCrawler\Field\FormField;
  */
 class Form extends Link implements \ArrayAccess
 {
+    /**
+     * @var \DOMNode
+     */
     private $button;
+    /**
+     * @var Field\FormField[]
+     */
     private $fields;
 
     /**
@@ -58,6 +64,8 @@ class Form extends Link implements \ArrayAccess
      *
      * @param array $values An array of field values
      *
+     * @return Form
+     *
      * @api
      */
     public function setValues(array $values)
@@ -133,7 +141,7 @@ class Form extends Link implements \ArrayAccess
      */
     public function getPhpValues()
     {
-        $qs = http_build_query($this->getValues());
+        $qs = http_build_query($this->getValues(), '', '&');
         parse_str($qs, $values);
 
         return $values;
@@ -151,7 +159,7 @@ class Form extends Link implements \ArrayAccess
      */
     public function getPhpFiles()
     {
-        $qs = http_build_query($this->getFiles());
+        $qs = http_build_query($this->getFiles(), '', '&');
         parse_str($qs, $values);
 
         return $values;
@@ -254,8 +262,6 @@ class Form extends Link implements \ArrayAccess
      *
      * @param Field\FormField $field The field
      *
-     * @return FormField The field instance
-     *
      * @api
      */
     public function set(Field\FormField $field)

vendor/symfony/src/Symfony/Component/DomCrawler/Link.php

@@ -20,8 +20,17 @@ namespace Symfony\Component\DomCrawler;
  */
 class Link
 {
+    /**
+     * @var \DOMNode A \DOMNode instance
+     */
     protected $node;
+    /**
+     * @var string The method to use for the link
+     */
     protected $method;
+    /**
+     * @var string The URI of the page where the link is embedded (or the base href)
+     */
     protected $currentUri;
 
     /**
@@ -31,7 +40,7 @@ class Link
      * @param string   $currentUri The URI of the page where the link is embedded (or the base href)
      * @param string   $method     The method to use for the link (get by default)
      *
-     * @throws \LogicException if the node is not a link
+     * @throws \InvalidArgumentException if the node is not a link
      *
      * @api
      */
@@ -90,7 +99,7 @@ class Link
         }
 
         // only an anchor
-        if ('#' ===  $uri[0]) {
+        if ('#' === $uri[0]) {
             $baseUri = $this->currentUri;
             if (false !== $pos = strpos($baseUri, '#')) {
                 $baseUri = substr($baseUri, 0, $pos);
@@ -120,11 +129,23 @@ class Link
         return substr($this->currentUri, 0, strrpos($this->currentUri, '/') + 1).$uri;
     }
 
+    /**
+     * Returns raw uri data
+     *
+     * @return string
+     */
     protected function getRawUri()
     {
         return $this->node->getAttribute('href');
     }
 
+    /**
+     * Sets current \DOMNode instance
+     *
+     * @param \DOMNode $node A \DOMNode instance
+     *
+     * @throws \LogicException If given node is not an anchor
+     */
     protected function setNode(\DOMNode $node)
     {
         if ('a' != $node->nodeName) {

vendor/symfony/src/Symfony/Component/EventDispatcher/EventDispatcher.php

@@ -117,7 +117,7 @@ class EventDispatcher implements EventDispatcherInterface
             if (is_string($params)) {
                 $this->addListener($eventName, array($subscriber, $params));
             } else {
-                $this->addListener($eventName, array($subscriber, $params[0]), $params[1]);
+                $this->addListener($eventName, array($subscriber, $params[0]), isset($params[1]) ? $params[1] : 0);
             }
         }
     }

vendor/symfony/src/Symfony/Component/Finder/Comparator/DateComparator.php

@@ -32,7 +32,10 @@ class DateComparator extends Comparator
             throw new \InvalidArgumentException(sprintf('Don\'t understand "%s" as a date test.', $test));
         }
 
-        if (false === $target = @strtotime($matches[2])) {
+        try {
+            $date = new \DateTime($matches[2]);
+            $target = $date->format('U');
+        } catch (\Exception $e) {
             throw new \InvalidArgumentException(sprintf('"%s" is not a valid date.', $matches[2]));
         }
 

vendor/symfony/src/Symfony/Component/HttpFoundation/ParameterBag.php

@@ -104,7 +104,7 @@ class ParameterBag
 
         $value = $this->parameters[$root];
         $currentKey = null;
-        for ($i=$pos,$c=strlen($path); $i<$c; $i++) {
+        for ($i = $pos, $c = strlen($path); $i < $c; $i++) {
             $char = $path[$i];
 
             if ('[' === $char) {
@@ -234,7 +234,7 @@ class ParameterBag
      * @param mixed   $default The default value if the parameter key does not exist
      * @param boolean $deep If true, a path like foo[bar] will find deeper items
      *
-     * @return string The filtered value
+     * @return integer The filtered value
      *
      * @api
      */

vendor/symfony/src/Symfony/Component/HttpFoundation/Request.php

@@ -564,9 +564,9 @@ class Request
     {
         if (self::$trustProxy && $this->headers->has('X-Forwarded-Port')) {
             return $this->headers->get('X-Forwarded-Port');
-        } else {
-            return $this->server->get('SERVER_PORT');
         }
+
+        return $this->server->get('SERVER_PORT');
     }
 
     /**

vendor/symfony/src/Symfony/Component/HttpFoundation/ServerBag.php

@@ -28,7 +28,7 @@ class ServerBag extends ParameterBag
             }
             // CONTENT_* are not prefixed with HTTP_
             elseif (in_array($key, array('CONTENT_LENGTH', 'CONTENT_MD5', 'CONTENT_TYPE'))) {
-                $headers[$key] = $this->parameters[$key];
+                $headers[$key] = $value;
             }
         }
 

vendor/symfony/src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php

@@ -26,6 +26,8 @@ class ErrorHandler
         E_USER_NOTICE       => 'User Notice',
         E_STRICT            => 'Runtime Notice',
         E_RECOVERABLE_ERROR => 'Catchable Fatal Error',
+        E_DEPRECATED        => 'Deprecated',
+        E_USER_DEPRECATED   => 'User Deprecated',
     );
 
     private $level;

vendor/symfony/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php

@@ -74,6 +74,7 @@ class ExceptionListener
         );
 
         $request = $request->duplicate(null, null, $attributes);
+        $request->setMethod('GET');
 
         try {
             $response = $event->getKernel()->handle($request, HttpKernelInterface::SUB_REQUEST, true);

vendor/symfony/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php

@@ -15,6 +15,7 @@ use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\Profiler\Profile;
 use Symfony\Component\HttpKernel\Profiler\Profiler;
 use Symfony\Component\HttpFoundation\RequestMatcherInterface;
 
@@ -32,6 +33,7 @@ class ProfilerListener
     protected $exception;
     protected $children;
     protected $requests;
+    protected $profiles;
 
     /**
      * Constructor.
@@ -48,6 +50,7 @@ class ProfilerListener
         $this->onlyException = (Boolean) $onlyException;
         $this->onlyMasterRequests = (Boolean) $onlyMasterRequests;
         $this->children = new \SplObjectStorage();
+        $this->profiles = array();
     }
 
     /**
@@ -85,14 +88,25 @@ class ProfilerListener
             return;
         }
 
+        $request = $event->getRequest();
         $exception = $this->exception;
         $this->exception = null;
 
-        if (null !== $this->matcher && !$this->matcher->matches($event->getRequest())) {
+        if (null !== $this->matcher && !$this->matcher->matches($request)) {
             return;
         }
 
-        if (!$profile = $this->profiler->collect($event->getRequest(), $event->getResponse(), $exception)) {
+        if (!$profile = $this->profiler->collect($request, $event->getResponse(), $exception)) {
+            return;
+        }
+
+        $this->profiles[] = $profile;
+
+        if (null !== $exception) {
+            foreach ($this->profiles as $profile) {
+                $this->profiler->saveProfile($profile);
+            }
+
             return;
         }
 
@@ -100,27 +114,36 @@ class ProfilerListener
         if (!$master) {
             array_pop($this->requests);
 
-            $parent = $this->requests[count($this->requests) - 1];
-            if (!isset($this->children[$parent])) {
-                $profiles = array($profile);
-            } else {
-                $profiles = $this->children[$parent];
-                $profiles[] = $profile;
-            }
-
+            $parent = end($this->requests);
+            $profiles = isset($this->children[$parent]) ? $this->children[$parent] : array();
+            $profiles[] = $profile;
             $this->children[$parent] = $profiles;
         }
 
-        // store the profile and its children
-        if (isset($this->children[$event->getRequest()])) {
-            foreach ($this->children[$event->getRequest()] as $child) {
+        if (isset($this->children[$request])) {
+            foreach ($this->children[$request] as $child) {
                 $child->setParent($profile);
                 $profile->addChild($child);
-                $this->profiler->saveProfile($child);
             }
-            $this->children[$event->getRequest()] = array();
+            $this->children[$request] = array();
         }
 
+        if ($master) {
+            $this->saveProfiles($profile);
+        }
+    }
+
+    /**
+     * Saves the profile hierarchy.
+     *
+     * @param Profile $profile The root profile
+     */
+    private function saveProfiles(Profile $profile)
+    {
         $this->profiler->saveProfile($profile);
+        foreach ($profile->getChildren() as $profile) {
+            $this->saveProfiles($profile);
+        }
     }
 }
+

vendor/symfony/src/Symfony/Component/HttpKernel/HttpCache/Store.php

@@ -110,7 +110,7 @@ class Store implements StoreInterface
         // find a cached entry that matches the request.
         $match = null;
         foreach ($entries as $entry) {
-            if ($this->requestsMatch(isset($entry[1]['vary']) ? $entry[1]['vary'][0] : '', $request->headers->all(), $entry[0])) {
+            if ($this->requestsMatch(isset($entry[1]['vary'][0]) ? $entry[1]['vary'][0] : '', $request->headers->all(), $entry[0])) {
                 $match = $entry;
 
                 break;
@@ -167,7 +167,7 @@ class Store implements StoreInterface
         $entries = array();
         $vary = $response->headers->get('vary');
         foreach ($this->getMetadata($key) as $entry) {
-            if (!isset($entry[1]['vary'])) {
+            if (!isset($entry[1]['vary'][0])) {
                 $entry[1]['vary'] = array('');
             }
 

vendor/symfony/src/Symfony/Component/HttpKernel/Kernel.php

@@ -57,7 +57,7 @@ abstract class Kernel implements KernelInterface
     protected $startTime;
     protected $classes;
 
-    const VERSION = '2.0.12';
+    const VERSION = '2.0.13';
 
     /**
      * Constructor.

vendor/symfony/src/Symfony/Component/Locale/Exception/MethodArgumentValueNotImplementedException.php

@@ -33,7 +33,7 @@ class MethodArgumentValueNotImplementedException extends NotImplementedException
             $methodName,
             $argName,
             var_export($argValue, true),
-            $additionalMessage != '' ? ' '.$additionalMessage.'. ' : ''
+            $additionalMessage !== '' ? ' '.$additionalMessage.'. ' : ''
         );
 
         parent::__construct($message);

vendor/symfony/src/Symfony/Component/Locale/Resources/stubs/functions.php

@@ -19,7 +19,8 @@ use Symfony\Component\Locale\Stub\StubIntl;
  * @return Boolean Whether the error code indicates an error
  * @see    Symfony\Component\Locale\Stub\StubIntl::isFailure
  */
-function intl_is_failure($errorCode) {
+function intl_is_failure($errorCode)
+{
     return StubIntl::isFailure($errorCode);
 }
 
@@ -31,9 +32,11 @@ function intl_is_failure($errorCode) {
  *                 StubIntl::U_ZERO_ERROR if no error occurred
  * @see    Symfony\Component\Locale\Stub\StubIntl::getErrorCode
  */
-function intl_get_error_code() {
+function intl_get_error_code()
+{
     return StubIntl::getErrorCode();
 }
+
 /**
  * Stub implementation for the intl_get_error_code function of the intl extension
  *
@@ -42,6 +45,19 @@ function intl_get_error_code() {
  *                 "U_ZERO_ERROR" if no error occurred
  * @see    Symfony\Component\Locale\Stub\StubIntl::getErrorMessage
  */
-function intl_get_error_message() {
+function intl_get_error_message()
+{
     return StubIntl::getErrorMessage();
 }
+
+/**
+ * Stub implementation for the intl_error_name function of the intl extension
+ *
+ * @return String will be the same as the name of the error code constant
+ *
+ * @see    Symfony\Component\Locale\Stub\StubIntl::getErrorName
+ */
+function intl_error_name($errorCode)
+{
+    return StubIntl::getErrorName($errorCode);
+}

vendor/symfony/src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php

@@ -155,7 +155,7 @@ class FullTransformer
         }
 
         // behave like the intl extension
-        StubIntl::setErrorCode(StubIntl::U_PARSE_ERROR);
+        StubIntl::setError(StubIntl::U_PARSE_ERROR, 'Date parsing failed');
 
         return false;
     }
@@ -292,7 +292,7 @@ class FullTransformer
 
         // If month is false, return immediately (intl behavior)
         if (false === $month) {
-            StubIntl::setErrorCode(StubIntl::U_PARSE_ERROR);
+            StubIntl::setError(StubIntl::U_PARSE_ERROR, 'Date parsing failed');
 
             return false;
         }

vendor/symfony/src/Symfony/Component/Locale/Stub/DateFormat/TimeZoneTransformer.php

@@ -88,7 +88,7 @@ class TimeZoneTransformer extends Transformer
                 ));
             }
 
-            return 'Etc/GMT'.($hours != 0 ? $signal.$hours : '');
+            return 'Etc/GMT'.($hours !== 0 ? $signal.$hours : '');
         }
 
         throw new \InvalidArgumentException('The GMT time zone \'%s\' does not match with the supported formats GMT[+-]HH:MM or GMT[+-]HHMM.');

vendor/symfony/src/Symfony/Component/Locale/Stub/StubCollator.php

@@ -21,16 +21,6 @@ use Symfony\Component\Locale\Exception\MethodArgumentValueNotImplementedExceptio
  */
 class StubCollator
 {
-    /**
-     * Constants defined by the intl extension, not class constants in IntlDateFormatter
-     * TODO: remove if the Form component drop the call to the intl_is_failure() function
-     *
-     * @see StubIntlDateFormatter::getErrorCode()
-     * @see StubIntlDateFormatter::getErrorMessage()
-     */
-    const U_ZERO_ERROR = 0;
-    const U_ZERO_ERROR_MESSAGE = 'U_ZERO_ERROR';
-
     /** Attribute constants */
     const FRENCH_COLLATION = 0;
     const ALTERNATE_HANDLING = 1;
@@ -158,7 +148,7 @@ class StubCollator
      */
     public function getErrorCode()
     {
-        return self::U_ZERO_ERROR;
+        return StubIntl::U_ZERO_ERROR;
     }
 
     /**
@@ -168,7 +158,7 @@ class StubCollator
      */
     public function getErrorMessage()
     {
-        return self::U_ZERO_ERROR_MESSAGE;
+        return 'U_ZERO_ERROR';
     }
 
     /**

vendor/symfony/src/Symfony/Component/Locale/Stub/StubIntl.php

@@ -45,28 +45,24 @@ abstract class StubIntl
      * @var array
      */
     private static $errorCodes = array(
-        self::U_ZERO_ERROR,
-        self::U_ILLEGAL_ARGUMENT_ERROR,
-        self::U_PARSE_ERROR,
+        self::U_ZERO_ERROR => 'U_ZERO_ERROR',
+        self::U_ILLEGAL_ARGUMENT_ERROR => 'U_ILLEGAL_ARGUMENT_ERROR',
+        self::U_PARSE_ERROR => 'U_PARSE_ERROR',
     );
 
     /**
-     * The error messages of all known error codes
+     * The error code of the last operation
      *
-     * @var array
+     * @var integer
      */
-    private static $errorMessages = array(
-        self::U_ZERO_ERROR => 'U_ZERO_ERROR',
-        self::U_ILLEGAL_ARGUMENT_ERROR => 'datefmt_format: takes either an array  or an integer timestamp value : U_ILLEGAL_ARGUMENT_ERROR',
-        self::U_PARSE_ERROR => 'Date parsing failed: U_PARSE_ERROR',
-    );
+    private static $errorCode = self::U_ZERO_ERROR;
 
     /**
      * The error code of the last operation
      *
      * @var integer
      */
-    private static $errorCode = self::U_ZERO_ERROR;
+    private static $errorMessage = 'U_ZERO_ERROR';
 
     /**
      * Returns whether the error code indicates a failure
@@ -77,8 +73,8 @@ abstract class StubIntl
      */
     static public function isFailure($errorCode)
     {
-        return in_array($errorCode, self::$errorCodes, true)
-            && $errorCode !== self::U_ZERO_ERROR;
+        return isset(self::$errorCodes[$errorCode])
+            && $errorCode > self::U_ZERO_ERROR;
     }
 
     /**
@@ -102,22 +98,38 @@ abstract class StubIntl
      */
     static public function getErrorMessage()
     {
-        return self::$errorMessages[self::$errorCode];
+        return self::$errorMessage;
+    }
+
+    /**
+     * Returns the symbolic name for a given error code
+     *
+     * @return string
+     */
+    static public function getErrorName($code)
+    {
+        if (isset(self::$errorCodes[$code])) {
+            return self::$errorCodes[$code];
+        }
+
+        return '[BOGUS UErrorCode]';
     }
 
     /**
-     * Sets the current error code
+     * Sets the current error
      *
-     * @param  integer $code  One of the error constants in this class
+     * @param  integer $code     One of the error constants in this class
+     * @param  string  $message  The ICU class error message
      *
      * @throws \InvalidArgumentException If the code is not one of the error constants in this class
      */
-    static public function setErrorCode($code)
+    static public function setError($code, $message = '')
     {
-        if (!isset(self::$errorMessages[$code])) {
+        if (!isset(self::$errorCodes[$code])) {
             throw new \InvalidArgumentException(sprintf('No such error code: "%s"', $code));
         }
 
+        self::$errorMessage = $message ? sprintf('%s: %s', $message, self::$errorCodes[$code]) : self::$errorCodes[$code];
         self::$errorCode = $code;
     }
 }

vendor/symfony/src/Symfony/Component/Locale/Stub/StubIntlDateFormatter.php

@@ -26,14 +26,18 @@ use Symfony\Component\Locale\Exception\MethodArgumentValueNotImplementedExceptio
 class StubIntlDateFormatter
 {
     /**
-     * Constants defined by the intl extension, not class constants in IntlDateFormatter
-     * TODO: remove if the Form component drop the call to the intl_is_failure() function
+     * The error code from the last operation
      *
-     * @see StubIntlDateFormatter::getErrorCode()
-     * @see StubIntlDateFormatter::getErrorMessage()
+     * @var integer
      */
-    const U_ZERO_ERROR = 0;
-    const U_ZERO_ERROR_MESSAGE = 'U_ZERO_ERROR';
+    protected $errorCode = StubIntl::U_ZERO_ERROR;
+
+    /**
+     * The error message from the last operation
+     *
+     * @var string
+     */
+    protected $errorMessage = 'U_ZERO_ERROR';
 
     /* date/time format types */
     const NONE = -1;
@@ -120,11 +124,11 @@ class StubIntlDateFormatter
      */
     public function __construct($locale, $datetype, $timetype, $timezone = null, $calendar = self::GREGORIAN, $pattern = null)
     {
-        if ('en' != $locale) {
+        if ('en' !== $locale) {
             throw new MethodArgumentValueNotImplementedException(__METHOD__, 'locale', $locale, 'Only the \'en\' locale is supported');
         }
 
-        if (self::GREGORIAN != $calendar) {
+        if (self::GREGORIAN !== $calendar) {
             throw new MethodArgumentValueNotImplementedException(__METHOD__, 'calendar', $calendar, 'Only the GREGORIAN calendar is supported');
         }
 
@@ -171,19 +175,42 @@ class StubIntlDateFormatter
     {
         // intl allows timestamps to be passed as arrays - we don't
         if (is_array($timestamp)) {
-            throw new MethodArgumentValueNotImplementedException(__METHOD__, 'timestamp', $timestamp, 'Only integer unix timestamps are supported');
+            $message = version_compare(\PHP_VERSION, '5.3.4', '>=') ?
+                'Only integer unix timestamps and DateTime objects are supported' :
+                'Only integer unix timestamps are supported';
+
+            throw new MethodArgumentValueNotImplementedException(__METHOD__, 'timestamp', $timestamp, $message);
+        }
+
+        // behave like the intl extension
+        $argumentError = null;
+        if (version_compare(\PHP_VERSION, '5.3.4', '<') && !is_int($timestamp)) {
+            $argumentError = 'datefmt_format: takes either an array  or an integer timestamp value ';
+        } elseif (version_compare(\PHP_VERSION, '5.3.4', '>=') && !is_int($timestamp) && !$timestamp instanceOf \DateTime) {
+            $argumentError = 'datefmt_format: takes either an array or an integer timestamp value or a DateTime object';
         }
 
-        if (!is_int($timestamp)) {
-            // behave like the intl extension
-            StubIntl::setErrorCode(StubIntl::U_ILLEGAL_ARGUMENT_ERROR);
+        if (null !== $argumentError) {
+            StubIntl::setError(StubIntl::U_ILLEGAL_ARGUMENT_ERROR, $argumentError);
+            $this->errorCode = StubIntl::getErrorCode();
+            $this->errorMessage = StubIntl::getErrorMessage();
 
             return false;
         }
 
+        // As of PHP 5.3.4, IntlDateFormatter::format() accepts DateTime instances
+        if (version_compare(\PHP_VERSION, '5.3.4', '>=') && $timestamp instanceOf \DateTime) {
+            $timestamp = $timestamp->getTimestamp();
+        }
+
         $transformer = new FullTransformer($this->getPattern(), $this->getTimeZoneId());
         $formatted = $transformer->format($this->createDateTime($timestamp));
 
+        // behave like the intl extension
+        StubIntl::setError(StubIntl::U_ZERO_ERROR);
+        $this->errorCode = StubIntl::getErrorCode();
+        $this->errorMessage = StubIntl::getErrorMessage();
+
         return $formatted;
     }
 
@@ -220,7 +247,7 @@ class StubIntlDateFormatter
      */
     public function getErrorCode()
     {
-        return self::U_ZERO_ERROR;
+        return $this->errorCode;
     }
 
     /**
@@ -232,7 +259,7 @@ class StubIntlDateFormatter
      */
     public function getErrorMessage()
     {
-        return self::U_ZERO_ERROR_MESSAGE;
+        return $this->errorMessage;
     }
 
     /**
@@ -345,12 +372,18 @@ class StubIntlDateFormatter
             throw new MethodArgumentNotImplementedException(__METHOD__, 'position');
         }
 
-        StubIntl::setErrorCode(StubIntl::U_ZERO_ERROR);
-
         $dateTime = $this->createDateTime(0);
         $transformer = new FullTransformer($this->getPattern(), $this->getTimeZoneId());
 
-        return $transformer->parse($dateTime, $value);
+        $timestamp = $transformer->parse($dateTime, $value);
+
+        // behave like the intl extension. FullTransformer::parse() set the proper error
+        if (false === $timestamp) {
+            $this->errorCode = StubIntl::getErrorCode();
+            $this->errorMessage = StubIntl::getErrorMessage();
+        }
+
+        return $timestamp;
     }
 
     /**

vendor/symfony/src/Symfony/Component/Locale/Stub/StubLocale.php

@@ -480,7 +480,7 @@ class StubLocale
      */
     static private function getStubData($locale, $cacheVariable, $stubDataDir)
     {
-        if ('en' != $locale) {
+        if ('en' !== $locale) {
             throw new \InvalidArgumentException(sprintf('Only the \'en\' locale is supported. %s', NotImplementedException::INTL_INSTALL_MESSAGE));
         }
 

vendor/symfony/src/Symfony/Component/Locale/Stub/StubNumberFormatter.php

@@ -24,33 +24,6 @@ use Symfony\Component\Locale\Exception\MethodArgumentValueNotImplementedExceptio
  */
 class StubNumberFormatter
 {
-    /**
-     * Constants defined by the intl extension, not class constants in NumberFormatter
-     * TODO: remove if the Form component drop the call to the intl_is_failure() function
-     *
-     * @see StubNumberFormatter::getErrorCode()
-     * @see StubNumberFormatter::getErrorMessage()
-     */
-    const U_ZERO_ERROR = 0;
-    const U_PARSE_ERROR = 9;
-
-    /**
-     * The error messages for each error code
-     *
-     * @var array
-     */
-    protected $errorMessages = array(
-        self::U_ZERO_ERROR => 'U_ZERO_ERROR',
-        self::U_PARSE_ERROR => 'Number parsing failed: U_PARSE_ERROR',
-    );
-
-    /**
-     * The error code from the last operation
-     *
-     * @var integer
-     */
-    protected $errorCode = self::U_ZERO_ERROR;
-
     /** Format style constants */
     const PATTERN_DECIMAL   = 0;
     const DECIMAL           = 1;
@@ -139,6 +112,30 @@ class StubNumberFormatter
     const PAD_AFTER_SUFFIX  = 3;
 
     /**
+     * The error code from the last operation
+     *
+     * @var integer
+     */
+    protected $errorCode = StubIntl::U_ZERO_ERROR;
+
+    /**
+     * The error message from the last operation
+     *
+     * @var string
+     */
+    protected $errorMessage = 'U_ZERO_ERROR';
+
+    /**
+     * @var string
+     */
+    private $locale;
+
+    /**
+     * @var int
+     */
+    private $style;
+
+    /**
      * Default values for the en locale
      *
      * @var array
@@ -225,16 +222,6 @@ class StubNumberFormatter
     );
 
     /**
-     * @var string
-     */
-    private $locale = null;
-
-    /**
-     * @var int
-     */
-    private $style = null;
-
-    /**
      * Constructor
      *
      * @param  string  $locale   The locale code
@@ -364,8 +351,12 @@ class StubNumberFormatter
         $fractionDigits = $this->getAttribute(self::FRACTION_DIGITS);
 
         $value = $this->round($value, $fractionDigits);
+        $value = $this->formatNumber($value, $fractionDigits);
 
-        return $this->formatNumber($value, $fractionDigits);
+        // behave like the intl extension
+        $this->resetError();
+
+        return $value;
     }
 
     /**
@@ -403,7 +394,7 @@ class StubNumberFormatter
      */
     public function getErrorMessage()
     {
-        return $this->errorMessages[$this->errorCode];
+        return $this->errorMessage;
     }
 
     /**
@@ -514,15 +505,21 @@ class StubNumberFormatter
 
         // Any string before the numeric value causes error in the parsing
         if (isset($matches[1]) && !empty($matches[1])) {
-            $this->errorCode = self::U_PARSE_ERROR;
+            StubIntl::setError(StubIntl::U_PARSE_ERROR, 'Number parsing failed');
+            $this->errorCode = StubIntl::getErrorCode();
+            $this->errorMessage = StubIntl::getErrorMessage();
 
             return false;
         }
 
         // Remove everything that is not number or dot (.)
         $value = preg_replace('/[^0-9\.\-]/', '', $value);
+        $value = $this->convertValueDataType($value, $type);
+
+        // behave like the intl extension
+        $this->resetError();
 
-        return $this->convertValueDataType($value, $type);
+        return $value;
     }
 
     /**
@@ -624,6 +621,16 @@ class StubNumberFormatter
     }
 
     /**
+     * Set the error to the default U_ZERO_ERROR
+     */
+    protected function resetError()
+    {
+        StubIntl::setError(StubIntl::U_ZERO_ERROR);
+        $this->errorCode = StubIntl::getErrorCode();
+        $this->errorMessage = StubIntl::getErrorMessage();
+    }
+
+    /**
      * Rounds a currency value, applying increment rounding if applicable
      *
      * When a currency have a rounding increment, an extra round is made after the first one. The rounding factor is

vendor/symfony/src/Symfony/Component/Routing/Generator/UrlGenerator.php

@@ -146,7 +146,7 @@ class UrlGenerator implements UrlGeneratorInterface
 
         // add a query string if needed
         $extra = array_diff_key($originParameters, $variables, $defaults);
-        if ($extra && $query = http_build_query($extra)) {
+        if ($extra && $query = http_build_query($extra, '', '&')) {
             $url .= '?'.$query;
         }
 

vendor/symfony/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php

@@ -31,6 +31,8 @@ class ApacheMatcherDumper extends MatcherDumper
      * @param array $options An array of options
      *
      * @return string A string to be used as Apache rewrite rules
+     *
+     * @throws \LogicException When the route regex is invalid
      */
     public function dump(array $options = array())
     {
@@ -39,6 +41,8 @@ class ApacheMatcherDumper extends MatcherDumper
             'base_uri'    => '',
         ), $options);
 
+        $options['script_name'] = self::escape($options['script_name'], ' ', '\\');
+
         $rules = array("# skip \"real\" requests\nRewriteCond %{REQUEST_FILENAME} -f\nRewriteRule .* - [QSA,L]");
         $methodVars = array();
 
@@ -46,8 +50,14 @@ class ApacheMatcherDumper extends MatcherDumper
             $compiledRoute = $route->compile();
 
             // prepare the apache regex
-            $regex = preg_replace('/\?P<.+?>/', '', substr(str_replace(array("\n", ' '), '', $compiledRoute->getRegex()), 1, -3));
-            $regex = '^'.preg_quote($options['base_uri']).substr($regex, 1);
+            $regex = $compiledRoute->getRegex();
+            $delimiter = $regex[0];
+            $regexPatternEnd = strrpos($regex, $delimiter);
+            if (strlen($regex) < 2 || 0 === $regexPatternEnd) {
+                throw new \LogicException('The "%s" route regex "%s" is invalid', $name, $regex);
+            }
+            $regex = preg_replace('/\?P<.+?>/', '', substr($regex, 1, $regexPatternEnd - 1));
+            $regex = '^'.self::escape(preg_quote($options['base_uri']).substr($regex, 1), ' ', '\\');
 
             $hasTrailingSlash = '/$' == substr($regex, -2) && '^/$' != $regex;
 
@@ -56,7 +66,6 @@ class ApacheMatcherDumper extends MatcherDumper
                 $variables[] = 'E=_ROUTING_'.$variable.':%'.($i + 1);
             }
             foreach ($route->getDefaults() as $key => $value) {
-                // todo: a more legit way to escape the value?
                 $variables[] = 'E=_ROUTING_'.$key.':'.strtr($value, array(
                     ':'  => '\\:',
                     '='  => '\\=',
@@ -112,4 +121,36 @@ class ApacheMatcherDumper extends MatcherDumper
 
         return implode("\n\n", $rules)."\n";
     }
+
+    /**
+     * Escapes a string.
+     *
+     * @param string $string The string to be escaped
+     * @param string $char   The character to be escaped
+     * @param string $with   The character to be used for escaping
+     *
+     * @return string The escaped string
+     */
+    static private function escape($string, $char, $with)
+    {
+        $escaped = false;
+        $output = '';
+        foreach(str_split($string) as $symbol) {
+            if ($escaped) {
+                $output .= $symbol;
+                $escaped = false;
+                continue;
+            }
+            if ($symbol === $char) {
+                $output .= $with.$char;
+                continue;
+            }
+            if ($symbol === $with) {
+                $escaped = true;
+            }
+            $output .= $symbol;
+        }
+
+        return $output;
+    }
 }

vendor/symfony/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php

@@ -148,7 +148,7 @@ EOF;
         $conditions = array();
         $hasTrailingSlash = false;
         $matches = false;
-        if (!count($compiledRoute->getVariables()) && false !== preg_match('#^(.)\^(?P<url>.*?)\$\1#', str_replace(array("\n", ' '), '', $compiledRoute->getRegex()), $m)) {
+        if (!count($compiledRoute->getVariables()) && false !== preg_match('#^(.)\^(?P<url>.*?)\$\1#', $compiledRoute->getRegex(), $m)) {
             if ($supportsRedirections && substr($m['url'], -1) === '/') {
                 $conditions[] = sprintf("rtrim(\$pathinfo, '/') === %s", var_export(rtrim(str_replace('\\', '', $m['url']), '/'), true));
                 $hasTrailingSlash = true;
@@ -160,7 +160,7 @@ EOF;
                 $conditions[] = sprintf("0 === strpos(\$pathinfo, %s)", var_export($compiledRoute->getStaticPrefix(), true));
             }
 
-            $regex = str_replace(array("\n", ' '), '', $compiledRoute->getRegex());
+            $regex = $compiledRoute->getRegex();
             if ($supportsRedirections && $pos = strpos($regex, '/$')) {
                 $regex = substr($regex, 0, $pos).'/?$'.substr($regex, $pos + 2);
                 $hasTrailingSlash = true;

vendor/symfony/src/Symfony/Component/Routing/RouteCollection.php

@@ -95,7 +95,7 @@ class RouteCollection implements \IteratorAggregate
     public function add($name, Route $route)
     {
         if (!preg_match('/^[a-z0-9A-Z_.]+$/', $name)) {
-            throw new \InvalidArgumentException(sprintf('Name "%s" contains non valid characters for a route name.', $name));
+            throw new \InvalidArgumentException(sprintf('The provided route name "%s" contains non valid characters. A route name must only contain digits (0-9), letters (a-z and A-Z), underscores (_) and dots (.).', $name));
         }
 
         $parent = $this;

vendor/symfony/src/Symfony/Component/Routing/RouteCompiler.php

@@ -66,7 +66,8 @@ class RouteCompiler implements RouteCompilerInterface
         // find the first optional token
         $firstOptional = INF;
         for ($i = count($tokens) - 1; $i >= 0; $i--) {
-            if ('variable' === $tokens[$i][0] && $route->hasDefault($tokens[$i][3])) {
+            $token = $tokens[$i];
+            if ('variable' === $token[0] && $route->hasDefault($token[3])) {
                 $firstOptional = $i;
             } else {
                 break;
@@ -74,36 +75,54 @@ class RouteCompiler implements RouteCompilerInterface
         }
 
         // compute the matching regexp
-        $regex = '';
-        $indent = 1;
-        if (1 === count($tokens) && 0 === $firstOptional) {
-            $token = $tokens[0];
-            ++$indent;
-            $regex .= str_repeat(' ', $indent * 4).sprintf("%s(?:\n", preg_quote($token[1], '#'));
-            $regex .= str_repeat(' ', $indent * 4).sprintf("(?P<%s>%s)\n", $token[3], $token[2]);
-        } else {
-            foreach ($tokens as $i => $token) {
-                if ('text' === $token[0]) {
-                    $regex .= str_repeat(' ', $indent * 4).preg_quote($token[1], '#')."\n";
-                } else {
-                    if ($i >= $firstOptional) {
-                        $regex .= str_repeat(' ', $indent * 4)."(?:\n";
-                        ++$indent;
-                    }
-                    $regex .= str_repeat(' ', $indent * 4).sprintf("%s(?P<%s>%s)\n", preg_quote($token[1], '#'), $token[3], $token[2]);
-                }
-            }
-        }
-        while (--$indent) {
-            $regex .= str_repeat(' ', $indent * 4).")?\n";
+        $regexp = '';
+        for ($i = 0, $nbToken = count($tokens); $i < $nbToken; $i++) {
+            $regexp .= $this->computeRegexp($tokens, $i, $firstOptional);
         }
 
         return new CompiledRoute(
             $route,
             'text' === $tokens[0][0] ? $tokens[0][1] : '',
-            sprintf("#^\n%s$#xs", $regex),
+            sprintf("#^%s$#s", $regexp),
             array_reverse($tokens),
             $variables
         );
     }
+
+    /**
+     * Computes the regexp used to match the token.
+     *
+     * @param array   $tokens        The route tokens
+     * @param integer $index         The index of the current token
+     * @param integer $firstOptional The index of the first optional token
+     *
+     * @return string The regexp
+     */
+    private function computeRegexp(array $tokens, $index, $firstOptional)
+    {
+        $token = $tokens[$index];
+        if('text' === $token[0]) {
+            // Text tokens
+            return preg_quote($token[1], '#');
+        } else {
+            // Variable tokens
+            if (0 === $index && 0 === $firstOptional && 1 == count($tokens)) {
+                // When the only token is an optional variable token, the separator is required
+                return sprintf('%s(?P<%s>%s)?', preg_quote($token[1], '#'), $token[3], $token[2]);
+            } else {
+                $nbTokens = count($tokens);
+                $regexp = sprintf('%s(?P<%s>%s)', preg_quote($token[1], '#'), $token[3], $token[2]);
+                if ($index >= $firstOptional) {
+                    // Enclose each optional tokens in a subpattern to make it optional
+                    $regexp = "(?:$regexp";
+                    if ($nbTokens - 1 == $index) {
+                        // Close the optional subpatterns
+                        $regexp .= str_repeat(")?", $nbTokens - $firstOptional);
+                    }
+                }
+
+                return $regexp;
+            }
+        }
+    }
 }

vendor/symfony/src/Symfony/Component/Security/Http/Firewall/ContextListener.php

@@ -20,7 +20,7 @@ use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
 use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
-use Symfony\Component\Security\Core\SecurityContext;
+use Symfony\Component\Security\Core\SecurityContextInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
@@ -37,7 +37,7 @@ class ContextListener implements ListenerInterface
     private $logger;
     private $userProviders;
 
-    public function __construct(SecurityContext $context, array $userProviders, $contextKey, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null)
+    public function __construct(SecurityContextInterface $context, array $userProviders, $contextKey, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null)
     {
         if (empty($contextKey)) {
             throw new \InvalidArgumentException('$contextKey must not be empty.');

vendor/symfony/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php

@@ -6,7 +6,7 @@ use Symfony\Component\HttpKernel\Log\LoggerInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Symfony\Component\Security\Core\SecurityContext;
+use Symfony\Component\Security\Core\SecurityContextInterface;
 use Symfony\Component\Security\Http\RememberMe\RememberMeServicesInterface;
 use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
 use Symfony\Component\Security\Http\SecurityEvents;
@@ -37,13 +37,13 @@ class RememberMeListener implements ListenerInterface
     /**
      * Constructor
      *
-     * @param SecurityContext                $securityContext
+     * @param SecurityContextInterface       $securityContext
      * @param RememberMeServicesInterface    $rememberMeServices
      * @param AuthenticationManagerInterface $authenticationManager
      * @param LoggerInterface                $logger
      * @param EventDispatcherInterface       $dispatcher
      */
-    public function __construct(SecurityContext $securityContext, RememberMeServicesInterface $rememberMeServices, AuthenticationManagerInterface $authenticationManager, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null)
+    public function __construct(SecurityContextInterface $securityContext, RememberMeServicesInterface $rememberMeServices, AuthenticationManagerInterface $authenticationManager, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null)
     {
         $this->securityContext = $securityContext;
         $this->rememberMeServices = $rememberMeServices;

vendor/symfony/src/Symfony/Component/Translation/README.md

@@ -10,12 +10,12 @@ translated strings from these including support for pluralization.
 
     $translator = new Translator('fr_FR', new MessageSelector());
     $translator->setFallbackLocale('fr');
-    $translator->addLoader('array', return new ArrayLoader());
+    $translator->addLoader('array', new ArrayLoader());
     $translator->addResource('array', array(
         'Hello World!' => 'Bonjour',
     ), 'fr');
 
-    $translator->trans('Hello World!');
+    echo $translator->trans('Hello World!') . "\n";
 
 Resources
 ---------

vendor/symfony/src/Symfony/Component/Validator/README.md

@@ -8,6 +8,7 @@ annotations, which can then be checked against instances of these classes.
     use Symfony\Component\Validator\Validator;
     use Symfony\Component\Validator\Mapping\ClassMetadataFactory;
     use Symfony\Component\Validator\Mapping\Loader\StaticMethodLoader;
+    use Symfony\Component\Validator\Constraints as Assert;
     use Symfony\Component\Validator\ConstraintValidatorFactory;
 
     $validator = new Validator(
@@ -20,10 +21,10 @@ annotations, which can then be checked against instances of these classes.
             'first_name' => new Assert\MinLength(101),
             'last_name'  => new Assert\MinLength(1),
         )),
-        'email' => new Assert\Email(),
-        'simple' => new Assert\MinLength(102),
-        'gender' => new Assert\Choice(array(3, 4)),
-        'file' => new Assert\File(),
+        'email'    => new Assert\Email(),
+        'simple'   => new Assert\MinLength(102),
+        'gender'   => new Assert\Choice(array(3, 4)),
+        'file'     => new Assert\File(),
         'password' => new Assert\MinLength(60),
     ));
 

vendor/symfony/tests/Symfony/Tests/Bridge/Monolog/Processor/WebProcessorTest.php

@@ -14,6 +14,7 @@ namespace Symfony\Tests\Bridge\Monolog\Processor;
 use Monolog\Logger;
 use Symfony\Bridge\Monolog\Processor\WebProcessor;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 class WebProcessorTest extends \PHPUnit_Framework_TestCase
 {
@@ -35,7 +36,18 @@ class WebProcessorTest extends \PHPUnit_Framework_TestCase
         $request = new Request();
         $request->server->replace($server);
 
-        $processor = new WebProcessor($request);
+        $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $event->expects($this->any())
+            ->method('getRequestType')
+            ->will($this->returnValue(HttpKernelInterface::MASTER_REQUEST));
+        $event->expects($this->any())
+            ->method('getRequest')
+            ->will($this->returnValue($request));
+
+        $processor = new WebProcessor();
+        $processor->onKernelRequest($event);
         $record = $processor($this->getRecord());
 
         $this->assertEquals($server['REQUEST_URI'], $record['extra']['url']);

vendor/symfony/tests/Symfony/Tests/Component/Console/ApplicationTest.php

@@ -201,8 +201,11 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
 
     public function testSetCatchExceptions()
     {
-        $application = new Application();
+        $application = $this->getMock('Symfony\Component\Console\Application', array('getTerminalWidth'));
         $application->setAutoExit(false);
+        $application->expects($this->any())
+            ->method('getTerminalWidth')
+            ->will($this->returnValue(120));
         $tester = new ApplicationTester($application);
 
         $application->setCatchExceptions(true);
@@ -237,8 +240,11 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
 
     public function testRenderException()
     {
-        $application = new Application();
+        $application = $this->getMock('Symfony\Component\Console\Application', array('getTerminalWidth'));
         $application->setAutoExit(false);
+        $application->expects($this->any())
+            ->method('getTerminalWidth')
+            ->will($this->returnValue(120));
         $tester = new ApplicationTester($application);
 
         $tester->run(array('command' => 'foo'), array('decorated' => false));
@@ -255,6 +261,15 @@ class ApplicationTest extends \PHPUnit_Framework_TestCase
         $tester->run(array('command' => 'foo3:bar'), array('decorated' => false));
         $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception3.txt', $this->normalize($tester->getDisplay()), '->renderException() renders a pretty exceptions with previous exceptions');
 
+        $application = $this->getMock('Symfony\Component\Console\Application', array('getTerminalWidth'));
+        $application->setAutoExit(false);
+        $application->expects($this->any())
+            ->method('getTerminalWidth')
+            ->will($this->returnValue(32));
+        $tester = new ApplicationTester($application);
+
+        $tester->run(array('command' => 'foo'), array('decorated' => false));
+        $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception4.txt', $this->normalize($tester->getDisplay()), '->renderException() wraps messages when they are bigger than the terminal');
     }
 
     public function testRun()

vendor/symfony/tests/Symfony/Tests/Component/Console/Fixtures/application_renderexception4.txt

@@ -0,0 +1,9 @@
+
+
+                               
+  [InvalidArgumentException]   
+  Command "foo" is not define  
+  d.                           
+                               
+
+

vendor/symfony/tests/Symfony/Tests/Component/DependencyInjection/Fixtures/yaml/badtag3.yml

@@ -0,0 +1,6 @@
+services:
+    foo_service:
+        class:    FooClass
+        tags:
+          # tag-attribute is not a scalar
+          - { name: foo, foo: { foo: foo, bar: bar } }

vendor/symfony/tests/Symfony/Tests/Component/DependencyInjection/Fixtures/yaml/services6.yml

@@ -14,6 +14,7 @@ services:
     class: FooClass
     calls:
       - [ setBar, [] ]
+      - [ setBar ]
   method_call2:
     class: FooClass
     calls:

vendor/symfony/tests/Symfony/Tests/Component/DependencyInjection/Loader/YamlFileLoaderTest.php

@@ -113,7 +113,7 @@ class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('sc_configure', $services['configurator1']->getConfigurator(), '->load() parses the configurator tag');
         $this->assertEquals(array(new Reference('baz'), 'configure'), $services['configurator2']->getConfigurator(), '->load() parses the configurator tag');
         $this->assertEquals(array('BazClass', 'configureStatic'), $services['configurator3']->getConfigurator(), '->load() parses the configurator tag');
-        $this->assertEquals(array(array('setBar', array())), $services['method_call1']->getMethodCalls(), '->load() parses the method_call tag');
+        $this->assertEquals(array(array('setBar', array()), array('setBar', array())), $services['method_call1']->getMethodCalls(), '->load() parses the method_call tag');
         $this->assertEquals(array(array('setBar', array('foo', new Reference('foo'), array(true, false)))), $services['method_call2']->getMethodCalls(), '->load() parses the method_call tag');
         $this->assertEquals('baz_factory', $services['factory_service']->getFactoryService());
 
@@ -169,7 +169,7 @@ class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase
             $loader->load('badtag1.yml');
             $this->fail('->load() should throw an exception when the tags key of a service is not an array');
         } catch (\Exception $e) {
-            $this->assertInstanceOf('\InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the tags key is not an array');
+            $this->assertInstanceOf('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the tags key is not an array');
             $this->assertStringStartsWith('Parameter "tags" must be an array for service', $e->getMessage(), '->load() throws an InvalidArgumentException if the tags key is not an array');
         }
     }
@@ -181,8 +181,20 @@ class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase
             $loader->load('badtag2.yml');
             $this->fail('->load() should throw an exception when a tag is missing the name key');
         } catch (\Exception $e) {
-            $this->assertInstanceOf('\InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if a tag is missing the name key');
+            $this->assertInstanceOf('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if a tag is missing the name key');
             $this->assertStringStartsWith('A "tags" entry is missing a "name" key for service ', $e->getMessage(), '->load() throws an InvalidArgumentException if a tag is missing the name key');
         }
     }
+
+    public function testTagWithAttributeArrayThrowsException()
+    {
+        $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
+        try {
+            $loader->load('badtag3.yml');
+            $this->fail('->load() should throw an exception when a tag-attribute is not a scalar');
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if a tag-attribute is not a scalar');
+            $this->assertStringStartsWith('A "tags" attribute must be of a scalar-type for service ', $e->getMessage(), '->load() throws an InvalidArgumentException if a tag-attribute is not a scalar');
+        }
+    }
 }

vendor/symfony/tests/Symfony/Tests/Component/EventDispatcher/EventDispatcherTest.php

@@ -241,6 +241,9 @@ class TestEventSubscriberWithPriorities implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
-        return array('pre.foo' => array('preFoo', 10));
+        return array(
+            'pre.foo' => array('preFoo', 10),
+            'post.foo' => array('postFoo'),
+            );
     }
 }

vendor/symfony/tests/Symfony/Tests/Component/Locale/Stub/StubCollatorTest.php

@@ -15,6 +15,7 @@ require_once __DIR__.'/../TestCase.php';
 
 use Symfony\Component\Locale\Locale;
 use Symfony\Component\Locale\Stub\StubCollator;
+use Symfony\Component\Locale\Stub\StubIntl;
 use Symfony\Tests\Component\Locale\TestCase as LocaleTestCase;
 
 class StubCollatorTest extends LocaleTestCase
@@ -91,13 +92,13 @@ class StubCollatorTest extends LocaleTestCase
     public function testGetErrorCode()
     {
         $collator = $this->createStubCollator();
-        $this->assertEquals(StubCollator::U_ZERO_ERROR, $collator->getErrorCode());
+        $this->assertEquals(StubIntl::U_ZERO_ERROR, $collator->getErrorCode());
     }
 
     public function testGetErrorMessage()
     {
         $collator = $this->createStubCollator();
-        $this->assertEquals(StubCollator::U_ZERO_ERROR_MESSAGE, $collator->getErrorMessage());
+        $this->assertEquals('U_ZERO_ERROR', $collator->getErrorMessage());
     }
 
     public function testGetLocale()

vendor/symfony/tests/Symfony/Tests/Component/Locale/Stub/StubIntlDateFormatterTest.php

@@ -53,49 +53,69 @@ class StubIntlDateFormatterTest extends LocaleTestCase
         $this->assertNull($formatter->getTimeZoneId());
     }
 
+    public function testFormatWithUnsupportedTimestampArgument()
+    {
+        $formatter = $this->createStubFormatter();
+
+        $localtime = array(
+            'tm_sec'   => 59,
+            'tm_min'   => 3,
+            'tm_hour'  => 15,
+            'tm_mday'  => 15,
+            'tm_mon'   => 3,
+            'tm_year'  => 112,
+            'tm_wday'  => 0,
+            'tm_yday'  => 105,
+            'tm_isdst' => 0
+        );
+
+        try {
+            $formatter->format($localtime);
+        } catch (\Exception $e) {
+            $this->assertInstanceOf('Symfony\Component\Locale\Exception\MethodArgumentValueNotImplementedException', $e);
+
+            if ($this->isGreaterOrEqualThanPhpVersion('5.3.4')) {
+                $this->assertStringEndsWith('Only integer unix timestamps and DateTime objects are supported.  Please install the \'intl\' extension for full localization capabilities.', $e->getMessage());
+            } else {
+                $this->assertStringEndsWith('Only integer unix timestamps are supported.  Please install the \'intl\' extension for full localization capabilities.', $e->getMessage());
+            }
+        }
+    }
+
     /**
      * @dataProvider formatProvider
      */
-    public function testFormatStub($pattern, $timestamp, $expected, $errorCode = 0, $errorMessage = 'U_ZERO_ERROR')
+    public function testFormatStub($pattern, $timestamp, $expected)
     {
+        $errorCode = StubIntl::U_ZERO_ERROR;
+        $errorMessage = 'U_ZERO_ERROR';
+
         $formatter = $this->createStubFormatter($pattern);
         $this->assertSame($expected, $formatter->format($timestamp));
         $this->assertSame($errorMessage, StubIntl::getErrorMessage());
         $this->assertSame($errorCode, StubIntl::getErrorCode());
-        $this->assertSame($errorCode != 0, StubIntl::isFailure(StubIntl::getErrorCode()));
+        $this->assertFalse(StubIntl::isFailure(StubIntl::getErrorCode()));
+        $this->assertSame($errorMessage, $formatter->getErrorMessage());
+        $this->assertSame($errorCode, $formatter->getErrorCode());
+        $this->assertFalse(StubIntl::isFailure($formatter->getErrorCode()));
     }
 
     /**
      * @dataProvider formatProvider
      */
-    public function testFormatIntl($pattern, $timestamp, $expected, $errorCode = 0, $errorMessage = 'U_ZERO_ERROR')
+    public function testFormatIntl($pattern, $timestamp, $expected)
     {
         $this->skipIfIntlExtensionIsNotLoaded();
         $this->skipIfICUVersionIsTooOld();
-        $formatter = $this->createIntlFormatter($pattern);
-        $this->assertSame($expected, $formatter->format($timestamp));
-        $this->assertSame($errorMessage, intl_get_error_message());
-        $this->assertSame($errorCode, intl_get_error_code());
-        $this->assertSame($errorCode != 0, intl_is_failure(intl_get_error_code()));
-    }
 
-    /**
-     * @dataProvider formatErrorProvider
-     */
-    public function testFormatErrorIntl($pattern, $timestamp, $expected, $errorCode = 0, $errorMessage = 'U_ZERO_ERROR')
-    {
-        $this->skipIfIntlExtensionIsNotLoaded();
-        $this->skipIfICUVersionIsTooOld();
-
-        if (version_compare(PHP_VERSION, '5.3.3') > 0) {
-            $this->markTestSkipped('The intl error messages were change in PHP 5.3.3.');
-        }
+        $errorCode = StubIntl::U_ZERO_ERROR;
+        $errorMessage = 'U_ZERO_ERROR';
 
         $formatter = $this->createIntlFormatter($pattern);
         $this->assertSame($expected, $formatter->format($timestamp));
         $this->assertSame($errorMessage, intl_get_error_message());
         $this->assertSame($errorCode, intl_get_error_code());
-        $this->assertSame($errorCode != 0, intl_is_failure(intl_get_error_code()));
+        $this->assertFalse(intl_is_failure(intl_get_error_code()));
     }
 
     public function formatProvider()
@@ -276,16 +296,67 @@ class StubIntlDateFormatterTest extends LocaleTestCase
             array('zzzzz', 0, 'GMT+00:00'),
         );
 
+        // As of PHP 5.3.4, IntlDateFormatter::format() accepts DateTime instances
+        if ($this->isGreaterOrEqualThanPhpVersion('5.3.4')) {
+            $dateTime = new \DateTime('@0');
+
+            /* general, DateTime */
+            $formatData[] = array('y-M-d', $dateTime, '1970-1-1');
+            $formatData[] = array("yyyy.MM.dd 'at' HH:mm:ss zzz", $dateTime, '1970.01.01 at 00:00:00 GMT+00:00');
+            $formatData[] = array("EEE, MMM d, ''yy", $dateTime, "Thu, Jan 1, '70");
+            $formatData[] = array('h:mm a', $dateTime, '12:00 AM');
+            $formatData[] = array('K:mm a, z', $dateTime, '0:00 AM, GMT+00:00');
+            $formatData[] = array('yyyyy.MMMM.dd hh:mm aaa', $dateTime, '01970.January.01 12:00 AM');
+        }
+
         return $formatData;
     }
 
+    /**
+     * @dataProvider formatErrorProvider
+     */
+    public function testFormatIllegalArgumentErrorStub($pattern, $timestamp, $errorMessage)
+    {
+        $errorCode = StubIntl::U_ILLEGAL_ARGUMENT_ERROR;
+
+        $formatter = $this->createStubFormatter($pattern);
+        $this->assertFalse($formatter->format($timestamp));
+        $this->assertSame($errorMessage, StubIntl::getErrorMessage());
+        $this->assertSame($errorCode, StubIntl::getErrorCode());
+        $this->assertTrue(StubIntl::isFailure(StubIntl::getErrorCode()));
+        $this->assertSame($errorMessage, $formatter->getErrorMessage());
+        $this->assertSame($errorCode, $formatter->getErrorCode());
+        $this->assertTrue(StubIntl::isFailure($formatter->getErrorCode()));
+    }
+
+    /**
+     * @dataProvider formatErrorProvider
+     */
+    public function testFormatIllegalArgumentErrorIntl($pattern, $timestamp, $errorMessage)
+    {
+        $this->skipIfIntlExtensionIsNotLoaded();
+        $this->skipIfICUVersionIsTooOld();
+
+        $errorCode = StubIntl::U_ILLEGAL_ARGUMENT_ERROR;
+
+        $formatter = $this->createIntlFormatter($pattern);
+        $this->assertFalse($formatter->format($timestamp));
+        $this->assertSame($errorMessage, intl_get_error_message());
+        $this->assertSame($errorCode, intl_get_error_code());
+        $this->assertTrue(intl_is_failure(intl_get_error_code()));
+    }
+
     public function formatErrorProvider()
     {
-        /* errors */
+        $message = 'datefmt_format: takes either an array  or an integer timestamp value : U_ILLEGAL_ARGUMENT_ERROR';
+
+        if ($this->isGreaterOrEqualThanPhpVersion('5.3.4')) {
+            $message = 'datefmt_format: takes either an array or an integer timestamp value or a DateTime object: U_ILLEGAL_ARGUMENT_ERROR';
+        }
 
         return array(
-            array('y-M-d', '0', false, 1, 'datefmt_format: takes either an array  or an integer timestamp value : U_ILLEGAL_ARGUMENT_ERROR'),
-            array('y-M-d', 'foobar', false, 1, 'datefmt_format: takes either an array  or an integer timestamp value : U_ILLEGAL_ARGUMENT_ERROR'),
+            array('y-M-d', '0', $message),
+            array('y-M-d', 'foobar', $message),
         );
     }
 
@@ -469,13 +540,13 @@ class StubIntlDateFormatterTest extends LocaleTestCase
     public function testGetErrorCode()
     {
         $formatter = $this->createStubFormatter();
-        $this->assertEquals(StubIntlDateFormatter::U_ZERO_ERROR, $formatter->getErrorCode());
+        $this->assertEquals(StubIntl::getErrorCode(), $formatter->getErrorCode());
     }
 
     public function testGetErrorMessage()
     {
         $formatter = $this->createStubFormatter();
-        $this->assertEquals(StubIntlDateFormatter::U_ZERO_ERROR_MESSAGE, $formatter->getErrorMessage());
+        $this->assertEquals(StubIntl::getErrorMessage(), $formatter->getErrorMessage());
     }
 
     public function testGetLocale()
@@ -527,7 +598,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase
         $this->assertSame($expected, $formatter->parse($value));
         $this->assertSame($errorMessage, intl_get_error_message());
         $this->assertSame($errorCode, intl_get_error_code());
-        $this->assertSame($errorCode != 0, intl_is_failure(intl_get_error_code()));
+        $this->assertFalse(intl_is_failure(intl_get_error_code()));
     }
 
     /**
@@ -542,7 +613,10 @@ class StubIntlDateFormatterTest extends LocaleTestCase
         $this->assertSame($expected, $formatter->parse($value));
         $this->assertSame($errorMessage, StubIntl::getErrorMessage());
         $this->assertSame($errorCode, StubIntl::getErrorCode());
-        $this->assertSame($errorCode != 0, StubIntl::isFailure(StubIntl::getErrorCode()));
+        $this->assertFalse(StubIntl::isFailure(StubIntl::getErrorCode()));
+        $this->assertSame($errorMessage, $formatter->getErrorMessage());
+        $this->assertSame($errorCode, $formatter->getErrorCode());
+        $this->assertFalse(StubIntl::isFailure($formatter->getErrorCode()));
     }
 
     public function parseProvider()
@@ -698,10 +772,10 @@ class StubIntlDateFormatterTest extends LocaleTestCase
 
         $this->skipIfIntlExtensionIsNotLoaded();
         $formatter = $this->createIntlFormatter($pattern);
-        $this->assertSame(false, $formatter->parse($value));
+        $this->assertFalse($formatter->parse($value));
         $this->assertSame($errorMessage, intl_get_error_message());
         $this->assertSame($errorCode, intl_get_error_code());
-        $this->assertSame($errorCode != 0, intl_is_failure(intl_get_error_code()));
+        $this->assertTrue(intl_is_failure(intl_get_error_code()));
     }
 
     /**
@@ -713,10 +787,13 @@ class StubIntlDateFormatterTest extends LocaleTestCase
         $errorMessage = 'Date parsing failed: U_PARSE_ERROR';
 
         $formatter = $this->createStubFormatter($pattern);
-        $this->assertSame(false, $formatter->parse($value));
+        $this->assertFalse($formatter->parse($value));
         $this->assertSame($errorMessage, StubIntl::getErrorMessage());
         $this->assertSame($errorCode, StubIntl::getErrorCode());
-        $this->assertSame($errorCode != 0, StubIntl::isFailure(StubIntl::getErrorCode()));
+        $this->assertTrue(StubIntl::isFailure(StubIntl::getErrorCode()));
+        $this->assertSame($errorMessage, $formatter->getErrorMessage());
+        $this->assertSame($errorCode, $formatter->getErrorCode());
+        $this->assertTrue(StubIntl::isFailure($formatter->getErrorCode()));
     }
 
     public function parseErrorProvider()

vendor/symfony/tests/Symfony/Tests/Component/Locale/Stub/StubIntlTest.php

@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Tests\Component\Locale\Stub;
+
+require_once __DIR__.'/../TestCase.php';
+
+use Symfony\Component\Locale\Locale;
+use Symfony\Component\Locale\Stub\StubIntl;
+use Symfony\Tests\Component\Locale\TestCase as LocaleTestCase;
+
+class StubIntlTest extends LocaleTestCase
+{
+    public function codeProvider()
+    {
+        return array (
+            array(-129, '[BOGUS UErrorCode]'),
+            array(0, 'U_ZERO_ERROR'),
+            array(1, 'U_ILLEGAL_ARGUMENT_ERROR'),
+            array(9, 'U_PARSE_ERROR'),
+            array(129, '[BOGUS UErrorCode]'),
+        );
+    }
+
+    /**
+     * @dataProvider codeProvider
+     */
+    public function testGetErrorName($code, $name)
+    {
+        $this->assertSame($name, StubIntl::getErrorName($code));
+    }
+
+    /**
+     * @dataProvider codeProvider
+     */
+    public function testGetErrorNameWithIntl($code, $name)
+    {
+        $this->skipIfIntlExtensionIsNotLoaded();
+        $this->assertSame(intl_error_name($code), StubIntl::getErrorName($code));
+    }
+}

vendor/symfony/tests/Symfony/Tests/Component/Locale/Stub/StubNumberFormatterTest.php

@@ -14,6 +14,7 @@ namespace Symfony\Tests\Component\Locale\Stub;
 require_once __DIR__.'/../TestCase.php';
 
 use Symfony\Component\Locale\Locale;
+use Symfony\Component\Locale\Stub\StubIntl;
 use Symfony\Component\Locale\Stub\StubNumberFormatter;
 use Symfony\Tests\Component\Locale\TestCase as LocaleTestCase;
 
@@ -224,15 +225,36 @@ class StubNumberFormatterTest extends LocaleTestCase
 
     public function testFormatStub()
     {
+        $errorCode = StubIntl::U_ZERO_ERROR;
+        $errorMessage = 'U_ZERO_ERROR';
+
         $formatter = $this->getStubFormatterWithDecimalStyle();
         $this->assertSame('9.555', $formatter->format(9.555));
+
+        $this->assertSame($errorMessage, StubIntl::getErrorMessage());
+        $this->assertSame($errorCode, StubIntl::getErrorCode());
+        $this->assertFalse(StubIntl::isFailure(StubIntl::getErrorCode()));
+        $this->assertSame($errorMessage, $formatter->getErrorMessage());
+        $this->assertSame($errorCode, $formatter->getErrorCode());
+        $this->assertFalse(StubIntl::isFailure($formatter->getErrorCode()));
     }
 
     public function testFormatIntl()
     {
         $this->skipIfIntlExtensionIsNotLoaded();
+
+        $errorCode = StubIntl::U_ZERO_ERROR;
+        $errorMessage = 'U_ZERO_ERROR';
+
         $formatter = $this->getIntlFormatterWithDecimalStyle();
         $this->assertSame('9.555', $formatter->format(9.555));
+
+        $this->assertSame($errorMessage, intl_get_error_message());
+        $this->assertSame($errorCode, intl_get_error_code());
+        $this->assertFalse(intl_is_failure(intl_get_error_code()));
+        $this->assertSame($errorMessage, $formatter->getErrorMessage());
+        $this->assertSame($errorCode, $formatter->getErrorCode());
+        $this->assertFalse(intl_is_failure($formatter->getErrorCode()));
     }
 
     /**
@@ -613,7 +635,7 @@ class StubNumberFormatterTest extends LocaleTestCase
     public function testGetErrorCode()
     {
         $formatter = $this->getStubFormatterWithDecimalStyle();
-        $this->assertEquals(StubNumberFormatter::U_ZERO_ERROR, $formatter->getErrorCode());
+        $this->assertEquals(StubIntl::U_ZERO_ERROR, $formatter->getErrorCode());
     }
 
     public function testGetLocale()
@@ -668,10 +690,19 @@ class StubNumberFormatterTest extends LocaleTestCase
         $this->assertSame($expected, $parsedValue, $message);
 
         if ($expected === false) {
-            $this->assertSame($formatter::U_PARSE_ERROR, $formatter->getErrorCode());
+            $errorCode = StubIntl::U_PARSE_ERROR;
+            $errorMessage = 'Number parsing failed: U_PARSE_ERROR';
         } else {
-            $this->assertEquals($formatter::U_ZERO_ERROR, $formatter->getErrorCode());
+            $errorCode = StubIntl::U_ZERO_ERROR;
+            $errorMessage = 'U_ZERO_ERROR';
         }
+
+        $this->assertSame($errorMessage, StubIntl::getErrorMessage());
+        $this->assertSame($errorCode, StubIntl::getErrorCode());
+        $this->assertSame($errorCode !== 0, StubIntl::isFailure(StubIntl::getErrorCode()));
+        $this->assertSame($errorMessage, $formatter->getErrorMessage());
+        $this->assertSame($errorCode, $formatter->getErrorCode());
+        $this->assertSame($errorCode !== 0, StubIntl::isFailure($formatter->getErrorCode()));
     }
 
     /**
@@ -681,15 +712,25 @@ class StubNumberFormatterTest extends LocaleTestCase
     {
         $this->skipIfIntlExtensionIsNotLoaded();
         $this->skipIfICUVersionIsTooOld();
+
         $formatter = $this->getIntlFormatterWithDecimalStyle();
         $parsedValue = $formatter->parse($value, \NumberFormatter::TYPE_DOUBLE);
         $this->assertSame($expected, $parsedValue, $message);
 
         if ($expected === false) {
-            $this->assertSame(U_PARSE_ERROR, $formatter->getErrorCode());
+            $errorCode = StubIntl::U_PARSE_ERROR;
+            $errorMessage = 'Number parsing failed: U_PARSE_ERROR';
         } else {
-            $this->assertEquals(U_ZERO_ERROR, $formatter->getErrorCode());
+            $errorCode = StubIntl::U_ZERO_ERROR;
+            $errorMessage = 'U_ZERO_ERROR';
         }
+
+        $this->assertSame($errorMessage, intl_get_error_message());
+        $this->assertSame($errorCode, intl_get_error_code());
+        $this->assertSame($errorCode > 0, intl_is_failure(intl_get_error_code()));
+        $this->assertSame($errorMessage, $formatter->getErrorMessage());
+        $this->assertSame($errorCode, $formatter->getErrorCode());
+        $this->assertSame($errorCode > 0, intl_is_failure($formatter->getErrorCode()));
     }
 
     public function parseProvider()

vendor/symfony/tests/Symfony/Tests/Component/Locale/TestCase.php

@@ -58,6 +58,11 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase
         }
     }
 
+    protected function isGreaterOrEqualThanPhpVersion($version)
+    {
+        return version_compare(\PHP_VERSION, $version, '>=');
+    }
+
     protected function isGreaterOrEqualThanIcuVersion($version)
     {
         $version = $this->normalizeIcuVersion($version);

vendor/symfony/tests/Symfony/Tests/Component/Routing/Fixtures/dumper/url_matcher1.apache

@@ -53,6 +53,10 @@ RewriteRule .* app.php [QSA,L,E=_ROUTING__route:baz5,E=_ROUTING_foo:%1]
 RewriteCond %{REQUEST_URI} ^/test/baz$
 RewriteRule .* app.php [QSA,L,E=_ROUTING__route:baz6,E=_ROUTING_foo:bar\ baz]
 
+# baz7
+RewriteCond %{REQUEST_URI} ^/te\ st/baz$
+RewriteRule .* app.php [QSA,L,E=_ROUTING__route:baz7]
+
 # 405 Method Not Allowed
 RewriteCond %{_ROUTING__allow_GET} !-z [OR]
 RewriteCond %{_ROUTING__allow_HEAD} !-z [OR]

vendor/symfony/tests/Symfony/Tests/Component/Routing/Fixtures/dumper/url_matcher1.php

@@ -26,12 +26,12 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
         $pathinfo = urldecode($pathinfo);
 
         // foo
-        if (0 === strpos($pathinfo, '/foo') && preg_match('#^/foo/(?P<bar>baz|symfony)$#xs', $pathinfo, $matches)) {
+        if (0 === strpos($pathinfo, '/foo') && preg_match('#^/foo/(?P<bar>baz|symfony)$#s', $pathinfo, $matches)) {
             return array_merge($this->mergeDefaults($matches, array (  'def' => 'test',)), array('_route' => 'foo'));
         }
 
         // bar
-        if (0 === strpos($pathinfo, '/bar') && preg_match('#^/bar/(?P<foo>[^/]+?)$#xs', $pathinfo, $matches)) {
+        if (0 === strpos($pathinfo, '/bar') && preg_match('#^/bar/(?P<foo>[^/]+?)$#s', $pathinfo, $matches)) {
             if (!in_array($this->context->getMethod(), array('GET', 'HEAD'))) {
                 $allow = array_merge($allow, array('GET', 'HEAD'));
                 goto not_bar;
@@ -42,7 +42,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
         not_bar:
 
         // barhead
-        if (0 === strpos($pathinfo, '/barhead') && preg_match('#^/barhead/(?P<foo>[^/]+?)$#xs', $pathinfo, $matches)) {
+        if (0 === strpos($pathinfo, '/barhead') && preg_match('#^/barhead/(?P<foo>[^/]+?)$#s', $pathinfo, $matches)) {
             if (!in_array($this->context->getMethod(), array('GET', 'HEAD'))) {
                 $allow = array_merge($allow, array('GET', 'HEAD'));
                 goto not_barhead;
@@ -68,13 +68,13 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
         }
 
         // baz4
-        if (0 === strpos($pathinfo, '/test') && preg_match('#^/test/(?P<foo>[^/]+?)/$#xs', $pathinfo, $matches)) {
+        if (0 === strpos($pathinfo, '/test') && preg_match('#^/test/(?P<foo>[^/]+?)/$#s', $pathinfo, $matches)) {
             $matches['_route'] = 'baz4';
             return $matches;
         }
 
         // baz5
-        if (0 === strpos($pathinfo, '/test') && preg_match('#^/test/(?P<foo>[^/]+?)/$#xs', $pathinfo, $matches)) {
+        if (0 === strpos($pathinfo, '/test') && preg_match('#^/test/(?P<foo>[^/]+?)/$#s', $pathinfo, $matches)) {
             if ($this->context->getMethod() != 'POST') {
                 $allow[] = 'POST';
                 goto not_baz5;
@@ -85,7 +85,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
         not_baz5:
 
         // baz.baz6
-        if (0 === strpos($pathinfo, '/test') && preg_match('#^/test/(?P<foo>[^/]+?)/$#xs', $pathinfo, $matches)) {
+        if (0 === strpos($pathinfo, '/test') && preg_match('#^/test/(?P<foo>[^/]+?)/$#s', $pathinfo, $matches)) {
             if ($this->context->getMethod() != 'PUT') {
                 $allow[] = 'PUT';
                 goto not_bazbaz6;
@@ -101,33 +101,38 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
         }
 
         // quoter
-        if (preg_match('#^/(?P<quoter>[\']+)$#xs', $pathinfo, $matches)) {
+        if (preg_match('#^/(?P<quoter>[\']+)$#s', $pathinfo, $matches)) {
             $matches['_route'] = 'quoter';
             return $matches;
         }
 
+        // space
+        if ($pathinfo === '/spa ce') {
+            return array('_route' => 'space');
+        }
+
         if (0 === strpos($pathinfo, '/a')) {
             if (0 === strpos($pathinfo, '/a/b\'b')) {
                 // foo1
-                if (preg_match('#^/a/b\'b/(?P<foo>[^/]+?)$#xs', $pathinfo, $matches)) {
+                if (preg_match('#^/a/b\'b/(?P<foo>[^/]+?)$#s', $pathinfo, $matches)) {
                     $matches['_route'] = 'foo1';
                     return $matches;
                 }
 
                 // bar1
-                if (preg_match('#^/a/b\'b/(?P<bar>[^/]+?)$#xs', $pathinfo, $matches)) {
+                if (preg_match('#^/a/b\'b/(?P<bar>[^/]+?)$#s', $pathinfo, $matches)) {
                     $matches['_route'] = 'bar1';
                     return $matches;
                 }
 
                 // foo2
-                if (preg_match('#^/a/b\'b/(?P<foo1>[^/]+?)$#xs', $pathinfo, $matches)) {
+                if (preg_match('#^/a/b\'b/(?P<foo1>[^/]+?)$#s', $pathinfo, $matches)) {
                     $matches['_route'] = 'foo2';
                     return $matches;
                 }
 
                 // bar2
-                if (preg_match('#^/a/b\'b/(?P<bar1>[^/]+?)$#xs', $pathinfo, $matches)) {
+                if (preg_match('#^/a/b\'b/(?P<bar1>[^/]+?)$#s', $pathinfo, $matches)) {
                     $matches['_route'] = 'bar2';
                     return $matches;
                 }
@@ -145,7 +150,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
             }
 
             // foo4
-            if (preg_match('#^/aba/(?P<foo>[^/]+?)$#xs', $pathinfo, $matches)) {
+            if (preg_match('#^/aba/(?P<foo>[^/]+?)$#s', $pathinfo, $matches)) {
                 $matches['_route'] = 'foo4';
                 return $matches;
             }
@@ -153,13 +158,13 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
         }
 
         // foo3
-        if (preg_match('#^/(?P<_locale>[^/]+?)/b/(?P<foo>[^/]+?)$#xs', $pathinfo, $matches)) {
+        if (preg_match('#^/(?P<_locale>[^/]+?)/b/(?P<foo>[^/]+?)$#s', $pathinfo, $matches)) {
             $matches['_route'] = 'foo3';
             return $matches;
         }
 
         // bar3
-        if (preg_match('#^/(?P<_locale>[^/]+?)/b/(?P<bar>[^/]+?)$#xs', $pathinfo, $matches)) {
+        if (preg_match('#^/(?P<_locale>[^/]+?)/b/(?P<bar>[^/]+?)$#s', $pathinfo, $matches)) {
             $matches['_route'] = 'bar3';
             return $matches;
         }

vendor/symfony/tests/Symfony/Tests/Component/Routing/Fixtures/dumper/url_matcher2.apache

@@ -0,0 +1,7 @@
+# skip "real" requests
+RewriteCond %{REQUEST_FILENAME} -f
+RewriteRule .* - [QSA,L]
+
+# foo
+RewriteCond %{REQUEST_URI} ^/foo$
+RewriteRule .* ap\ p_d\ ev.php [QSA,L,E=_ROUTING__route:foo]