Maj sf 2.0.8 -> 2.0.11

app/bootstrap.php.cache

@@ -456,7 +456,7 @@ abstract class Kernel implements KernelInterface
     protected $startTime;
     protected $classes;
 
-    const VERSION = '2.0.8';
+    const VERSION = '2.0.11';
 
     
     public function __construct($environment, $debug)
@@ -821,7 +821,7 @@ abstract class Kernel implements KernelInterface
     {
         $parameters = array();
         foreach ($_SERVER as $key => $value) {
-            if ('SYMFONY__' === substr($key, 0, 9)) {
+            if (0 === strpos($key, 'SYMFONY__')) {
                 $parameters[strtolower(str_replace('__', '.', substr($key, 9)))] = $value;
             }
         }

deps

@@ -1,10 +1,10 @@
 [symfony]
     git=http://github.com/symfony/symfony.git
-    version=v2.0.8
+    version=v2.0.11
 
 [twig]
     git=http://github.com/fabpot/Twig.git
-    version=v1.4.0
+    version=v1.6.0
 
 [monolog]
     git=http://github.com/Seldaek/monolog.git
@@ -16,15 +16,15 @@
 
 [doctrine-dbal]
     git=http://github.com/doctrine/dbal.git
-    version=2.1.5
+    version=2.1.6
 
 [doctrine]
     git=http://github.com/doctrine/doctrine2.git
-    version=2.1.5
+    version=2.1.6
 
 [swiftmailer]
     git=http://github.com/swiftmailer/swiftmailer.git
-    version=v4.1.4
+    version=v4.1.5
 
 [assetic]
     git=http://github.com/kriswallsmith/assetic.git
@@ -55,18 +55,9 @@
 [SensioGeneratorBundle]
     git=http://github.com/sensio/SensioGeneratorBundle.git
     target=/bundles/Sensio/Bundle/GeneratorBundle
+    version=origin/2.0
 
 [AsseticBundle]
     git=http://github.com/symfony/AsseticBundle.git
     target=/bundles/Symfony/Bundle/AsseticBundle
-
-[FOSUserBundle]
-    git=git://github.com/FriendsOfSymfony/FOSUserBundle.git
-    target=bundles/FOS/UserBundle
-
-[doctrine-fixtures]
-    git=http://github.com/doctrine/data-fixtures.git
-
-[DoctrineFixturesBundle]
-    git=http://github.com/symfony/DoctrineFixturesBundle.git
-    target=/bundles/Symfony/Bundle/DoctrineFixturesBundle
+    version=v1.0.1

deps.lock

@@ -1,14 +1,15 @@
-symfony 5b4e6190c4420524e4dcaf51213c4ad78f646528
-twig 0b7d6dfa0cf0dfb6a3c5745b6434ebd6ea32e90e
-monolog b704c49a3051536f67f2d39f13568f74615b9922
-doctrine-common b886898821288d305862ee9c567cc5b5cbb4c0dc
-doctrine-dbal ae358bd94ec09d7d3ad92ca7820e67825ad9e5f4
-doctrine da0e3439aba4c8bf5e8a6ee4ccee5ce2624be8d1
-swiftmailer eb0ecaa4243efc46e0f54d87c6454e49aa4b62dd
-assetic f829ad23d23c87480151a21faad49fefe7c09e5d
-twig-extensions d75a453b4e1ad48216cc4803ba9095855f130774
-metadata 8717ad2a5689480765d9ffafe925cd8a2457e582
-SensioFrameworkExtraBundle 1c7e92f466d11f83130b0c1271f44d067a2c3b31
-JMSSecurityExtraBundle b8b7eb294ed83d83ca7260ac018e701f08003538
+symfony v2.0.11
+twig v1.6.0
+monolog 1.0.2
+doctrine-common 2.1.4
+doctrine-dbal 2.1.6
+doctrine 2.1.6
+swiftmailer v4.1.5
+assetic v1.0.2
+twig-extensions 1dfff8e793f50f651c4f74f796c2c68a4aee3147
+metadata 1.0.0
+SensioFrameworkExtraBundle 638f545b7020b9e9d5944a7e3167f60ed848250d
+JMSSecurityExtraBundle 541a4c242328dc04b99540c75346cc74a7c0cfb5
 SensioDistributionBundle 20b66a408084ad8752f98e50f10533f5245310bf
-SensioGeneratorBundle 87fe88c4c8dc09cb197ba4b2d6d5b834e2c64980
+SensioGeneratorBundle dd37fc4487bc09ac01bdcf89e0ff4ee4484b7fab
+AsseticBundle v1.0.1

src/Muzich/CoreBundle/DataFixtures/ORM/LoadElementData.php

@@ -2,6 +2,7 @@
 
 namespace Muzich\UserBundle\DataFixtures\ORM;
 
+use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
@@ -67,7 +68,7 @@ class LoadElementData  extends AbstractFixture implements OrderedFixtureInterfac
     return date('Y-m-d H:i:s', time() - 60 * 60 *24 * $ecal);
   }
   
-  public function load($entity_manager)
+  public function load(ObjectManager $entity_manager)
   {
     $this->entity_manager = $entity_manager;
     

src/Muzich/CoreBundle/DataFixtures/ORM/LoadGroupData.php

@@ -2,6 +2,7 @@
 
 namespace Muzich\UserBundle\DataFixtures\ORM;
 
+use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
@@ -75,7 +76,7 @@ class LoadGroupData  extends AbstractFixture implements OrderedFixtureInterface,
     }
   }
   
-  public function load($entity_manager)
+  public function load(ObjectManager $entity_manager)
   {
     $this->entity_manager = $entity_manager;
 

src/Muzich/CoreBundle/DataFixtures/ORM/LoadTagData.php

@@ -2,6 +2,7 @@
 
 namespace Muzich\UserBundle\DataFixtures\ORM;
 
+use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
@@ -35,7 +36,7 @@ class LoadTagData  extends AbstractFixture implements OrderedFixtureInterface, C
     $this->addReference('tag_'.strtolower(str_replace(' ', '-', $name)), $tag);
   }
   
-  public function load($entity_manager)
+  public function load(ObjectManager $entity_manager)
   {
     $this->entity_manager = $entity_manager;
 

src/Muzich/CoreBundle/DataFixtures/ORM/LoadUsersElementsFavoritesData.php

@@ -2,6 +2,7 @@
 
 namespace Muzich\UserBundle\DataFixtures\ORM;
 
+use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
@@ -36,7 +37,7 @@ class LoadUsersElementsFavoritesData  extends AbstractFixture implements Ordered
     //$this->addReference('user_tag_'.$user->getId().'_'.$tag->getId(), $userTag);
   }
   
-  public function load($entity_manager)
+  public function load(ObjectManager $entity_manager)
   {
     $this->entity_manager = $entity_manager;
 

src/Muzich/CoreBundle/DataFixtures/ORM/LoadUsersTagsFavoritesData.php

@@ -2,6 +2,7 @@
 
 namespace Muzich\UserBundle\DataFixtures\ORM;
 
+use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
@@ -37,7 +38,7 @@ class LoadUsersTagsFavoritesData  extends AbstractFixture implements OrderedFixt
     //$this->addReference('user_tag_'.$user->getId().'_'.$tag->getId(), $userTag);
   }
   
-  public function load($entity_manager)
+  public function load(ObjectManager $entity_manager)
   {
     $this->entity_manager = $entity_manager;
 

src/Muzich/UserBundle/DataFixtures/ORM/LoadUserData.php

@@ -2,6 +2,7 @@
 
 namespace Muzich\UserBundle\DataFixtures\ORM;
 
+use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
@@ -65,7 +66,7 @@ class LoadUserData extends AbstractFixture implements OrderedFixtureInterface, C
     $this->entity_manager->persist($heFollowHim);
   }
   
-  public function load($entity_manager)
+  public function load(ObjectManager $entity_manager)
   {
     
     $this->entity_manager = $entity_manager;

vendor/bundles/FOS/UserBundle

@@ -1 +1 @@
-Subproject commit 2fed320b14593455d6e821d081f76ee27cb0a8e1
+Subproject commit a0e50724825fd73531a563f514168d8536b9187e

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

@@ -104,7 +104,7 @@ class DoctrineParamConverter implements ParamConverterInterface
     protected function getOptions(ConfigurationInterface $configuration)
     {
         return array_replace(array(
-            'entity_manager' => 'default',
+            'entity_manager' => null,
         ), $configuration->getOptions());
     }
 }

vendor/bundles/Sensio/Bundle/GeneratorBundle/Command/GenerateBundleCommand.php

@@ -145,6 +145,9 @@ EOT
             'sub-namespaces, and it should end with the bundle name itself',
             '(which must have <comment>Bundle</comment> as a suffix).',
             '',
+            'See http://symfony.com/doc/current/cookbook/bundles/best_practices.html#index-1 for more',
+            'details on bundle naming conventions.',
+            '',
             'Use <comment>/</comment> instead of <comment>\\</comment> for the namespace delimiter to avoid any problem.',
             '',
         ));

vendor/bundles/Sensio/Bundle/GeneratorBundle/Generator/BundleGenerator.php

@@ -11,7 +11,7 @@
 
 namespace Sensio\Bundle\GeneratorBundle\Generator;
 
-use Symfony\Component\HttpKernel\Util\Filesystem;
+use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\DependencyInjection\Container;
 
 /**

vendor/bundles/Sensio/Bundle/GeneratorBundle/Generator/DoctrineCrudGenerator.php

@@ -11,7 +11,7 @@
 
 namespace Sensio\Bundle\GeneratorBundle\Generator;
 
-use Symfony\Component\HttpKernel\Util\Filesystem;
+use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 

vendor/bundles/Sensio/Bundle/GeneratorBundle/Generator/DoctrineEntityGenerator.php

@@ -11,7 +11,7 @@
 
 namespace Sensio\Bundle\GeneratorBundle\Generator;
 
-use Symfony\Component\HttpKernel\Util\Filesystem;
+use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 use Symfony\Bridge\Doctrine\RegistryInterface;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;

vendor/bundles/Sensio/Bundle/GeneratorBundle/Generator/DoctrineFormGenerator.php

@@ -11,7 +11,7 @@
 
 namespace Sensio\Bundle\GeneratorBundle\Generator;
 
-use Symfony\Component\HttpKernel\Util\Filesystem;
+use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 

vendor/bundles/Symfony/Bundle/AsseticBundle/Controller/AsseticController.php

@@ -58,7 +58,6 @@ class AsseticController
         }
 
         $response = $this->createResponse();
-        $response->setExpires(new \DateTime());
 
         // last-modified
         if (null !== $lastModified = $asset->getLastModified()) {

vendor/bundles/Symfony/Bundle/AsseticBundle/DependencyInjection/DirectoryResourceDefinition.php

@@ -68,7 +68,7 @@ class DirectoryResourceDefinition extends Definition
             ->addArgument(new Reference('templating.loader'))
             ->addArgument($bundle)
             ->addArgument($dir)
-            ->addArgument('/\.[^.]+\.'.$engine.'$/')
+            ->addArgument('/^[^.]+\.[^.]+\.'.$engine.'$/')
             ->setPublic(false)
         ;
     }

vendor/bundles/Symfony/Bundle/AsseticBundle/Resources/config/filters/coffee.xml

@@ -8,7 +8,6 @@
         <parameter key="assetic.filter.coffee.class">Assetic\Filter\CoffeeScriptFilter</parameter>
         <parameter key="assetic.filter.coffee.bin">/usr/bin/coffee</parameter>
         <parameter key="assetic.filter.coffee.node">%assetic.node.bin%</parameter>
-        <parameter key="assetic.filter.coffee.bare">null</parameter>
     </parameters>
 
     <services>
@@ -16,7 +15,6 @@
             <tag name="assetic.filter" alias="coffee" />
             <argument>%assetic.filter.coffee.bin%</argument>
             <argument>%assetic.filter.coffee.node%</argument>
-            <call method="setBare"><argument>%assetic.filter.coffee.bare%</argument></call>
         </service>
     </services>
 </container>

vendor/bundles/Symfony/Bundle/AsseticBundle/composer.json

@@ -1,27 +0,0 @@
-{
-    "name": "symfony/assetic-bundle",
-    "description": "Integrates Assetic into Symfony2",
-    "keywords": ["assets", "compression", "minification"],
-    "homepage": "https://github.com/symfony/AsseticBundle",
-    "type": "symfony-bundle",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Kris Wallsmith",
-            "email": "kris.wallsmith@gmail.com",
-            "homepage": "http://kriswallsmith.net/"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.0",
-        "symfony/framework-bundle": "2.*",
-        "kriswallsmith/assetic": "master-dev"
-    },
-    "suggest": {
-        "symfony/twig-bundle": "2.*"
-    },
-    "autoload": {
-        "psr-0": { "Symfony\\Bundle\\AsseticBundle": "" }
-    },
-    "target-dir": "Symfony/Bundle/AsseticBundle"
-}

vendor/doctrine-dbal/lib/Doctrine/DBAL/Driver/IBMDB2/DB2Driver.php

@@ -41,8 +41,8 @@ class DB2Driver implements Driver
      */
     public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
     {
-        if ( !isset($params['schema']) ) {
-            
+        if ( ! isset($params['protocol'])) {
+            $params['protocol'] = 'TCPIP';
         }
 
         if ($params['host'] !== 'localhost' && $params['host'] != '127.0.0.1') {
@@ -50,10 +50,13 @@ class DB2Driver implements Driver
             $params['dbname'] = 'DRIVER={IBM DB2 ODBC DRIVER}' .
                      ';DATABASE=' . $params['dbname'] .
                      ';HOSTNAME=' . $params['host'] .
-                     ';PORT='     . $params['port'] .
                      ';PROTOCOL=' . $params['protocol'] .
                      ';UID='      . $username .
                      ';PWD='      . $password .';';
+            if (isset($params['port'])) {
+                $params['dbname'] .= 'PORT=' . $params['port'];
+            }
+
             $username = null;
             $password = null;
         }

vendor/doctrine-dbal/lib/Doctrine/DBAL/Platforms/AbstractPlatform.php

@@ -987,7 +987,7 @@ abstract class AbstractPlatform
         $sql = $this->_getCreateTableSQL($tableName, $columns, $options);
         if ($this->supportsCommentOnStatement()) {
             foreach ($table->getColumns() AS $column) {
-                if ($column->getComment()) {
+                if ($this->getColumnComment($column)) {
                     $sql[] = $this->getCommentOnColumnSQL($tableName, $column->getName(), $this->getColumnComment($column));
                 }
             }

vendor/doctrine-dbal/lib/Doctrine/DBAL/Platforms/MsSqlPlatform.php

@@ -596,7 +596,7 @@ class MsSqlPlatform extends AbstractPlatform
             }
 
             if ($offset == 0) {
-                $query = preg_replace('/^SELECT\s/i', 'SELECT TOP ' . $count . ' ', $query);
+                $query = preg_replace('/^(SELECT\s(DISTINCT\s)?)/i', '\1TOP ' . $count . ' ', $query);
             } else {
                 $orderby = stristr($query, 'ORDER BY');
 

vendor/doctrine-dbal/lib/Doctrine/DBAL/Platforms/OraclePlatform.php

@@ -450,16 +450,13 @@ END;';
           cols.position,
           r_alc.table_name \"references_table\",
           r_cols.column_name \"foreign_column\"
-     FROM all_cons_columns cols
-LEFT JOIN all_constraints alc
+     FROM user_cons_columns cols
+LEFT JOIN user_constraints alc
        ON alc.constraint_name = cols.constraint_name
-      AND alc.owner = cols.owner
-LEFT JOIN all_constraints r_alc
+LEFT JOIN user_constraints r_alc
        ON alc.r_constraint_name = r_alc.constraint_name
-      AND alc.r_owner = r_alc.owner
-LEFT JOIN all_cons_columns r_cols
+LEFT JOIN user_cons_columns r_cols
        ON r_alc.constraint_name = r_cols.constraint_name
-      AND r_alc.owner = r_cols.owner
       AND cols.position = r_cols.position
     WHERE alc.constraint_name = cols.constraint_name
       AND alc.constraint_type = 'R'
@@ -475,9 +472,18 @@ LEFT JOIN all_cons_columns r_cols
     public function getListTableColumnsSQL($table, $database = null)
     {
         $table = strtoupper($table);
-        return "SELECT c.*, d.comments FROM all_tab_columns c ".
-               "INNER JOIN all_col_comments d ON d.OWNER = c.OWNER AND d.TABLE_NAME = c.TABLE_NAME AND d.COLUMN_NAME = c.COLUMN_NAME ".
-               "WHERE c.table_name = '" . $table . "' ORDER BY c.column_name";
+
+        $tabColumnsTableName = "user_tab_columns";
+        $ownerCondition = '';
+        if(null !== $database){
+            $database = strtoupper($database);
+            $tabColumnsTableName = "all_tab_columns";
+            $ownerCondition = "AND c.owner = '".$database."'";
+        }
+
+        return "SELECT c.*, d.comments FROM $tabColumnsTableName c ".
+               "INNER JOIN user_col_comments d ON d.TABLE_NAME = c.TABLE_NAME AND d.COLUMN_NAME = c.COLUMN_NAME ".
+               "WHERE c.table_name = '" . $table . "' ".$ownerCondition." ORDER BY c.column_name";
     }
 
     /**

vendor/doctrine-dbal/lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php

@@ -269,10 +269,11 @@ class PostgreSqlPlatform extends AbstractPlatform
         $whereClause = $namespaceAlias.".nspname NOT IN ('pg_catalog', 'information_schema', 'pg_toast') AND ";
         if (strpos($table, ".") !== false) {
             list($schema, $table) = explode(".", $table);
-            $whereClause .= "$classAlias.relname = '" . $table . "' AND $namespaceAlias.nspname = '" . $schema . "'";
+            $schema = "'" . $schema . "'";
         } else {
-            $whereClause .= "$classAlias.relname = '" . $table . "'";
+            $schema = "ANY(string_to_array((select setting from pg_catalog.pg_settings where name = 'search_path'),','))";
         }
+        $whereClause .= "$classAlias.relname = '" . $table . "' AND $namespaceAlias.nspname = $schema";
 
         return $whereClause;
     }

vendor/doctrine-dbal/lib/Doctrine/DBAL/Platforms/SqlitePlatform.php

@@ -470,6 +470,7 @@ class SqlitePlatform extends AbstractPlatform
             'longtext'         => 'text',
             'text'             => 'text',
             'varchar'          => 'string',
+            'longvarchar'      => 'string',
             'varchar2'         => 'string',
             'nvarchar'         => 'string',
             'image'            => 'string',

vendor/doctrine-dbal/lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php

@@ -473,8 +473,8 @@ abstract class AbstractSchemaManager
      */
     public function dropAndCreateSequence(Sequence $sequence)
     {
-        $this->tryMethod('createSequence', $seqName, $start, $allocationSize);
-        $this->createSequence($seqName, $start, $allocationSize);
+        $this->tryMethod('dropSequence', $sequence->getQuotedName($this->_platform));
+        $this->createSequence($sequence);
     }
 
     /**
@@ -799,4 +799,4 @@ abstract class AbstractSchemaManager
     {
         return str_replace('(DC2Type:'.$type.')', '', $comment);
     }
-}
+}

vendor/doctrine-dbal/lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php

@@ -170,26 +170,44 @@ class MySqlSchemaManager extends AbstractSchemaManager
         return new Column($tableColumn['field'], \Doctrine\DBAL\Types\Type::getType($type), $options);
     }
 
-    public function _getPortableTableForeignKeyDefinition($tableForeignKey)
+    protected function _getPortableTableForeignKeysList($tableForeignKeys)
     {
-        $tableForeignKey = array_change_key_case($tableForeignKey, CASE_LOWER);
+        $list = array();
+        foreach ($tableForeignKeys as $key => $value) {
+            $value = array_change_key_case($value, CASE_LOWER);
+            if (!isset($list[$value['constraint_name']])) {
+                if (!isset($value['delete_rule']) || $value['delete_rule'] == "RESTRICT") {
+                    $value['delete_rule'] = null;
+                }
+                if (!isset($value['update_rule']) || $value['update_rule'] == "RESTRICT") {
+                    $value['update_rule'] = null;
+                }
 
-        if (!isset($tableForeignKey['delete_rule']) || $tableForeignKey['delete_rule'] == "RESTRICT") {
-            $tableForeignKey['delete_rule'] = null;
+                $list[$value['constraint_name']] = array(
+                    'name' => $value['constraint_name'],
+                    'local' => array(),
+                    'foreign' => array(),
+                    'foreignTable' => $value['referenced_table_name'],
+                    'onDelete' => $value['delete_rule'],
+                    'onUpdate' => $value['update_rule'],
+                );
+            }
+            $list[$value['constraint_name']]['local'][] = $value['column_name'];
+            $list[$value['constraint_name']]['foreign'][] = $value['referenced_column_name'];
         }
-        if (!isset($tableForeignKey['update_rule']) || $tableForeignKey['update_rule'] == "RESTRICT") {
-            $tableForeignKey['update_rule'] = null;
+
+        $result = array();
+        foreach($list AS $constraint) {
+            $result[] = new ForeignKeyConstraint(
+                array_values($constraint['local']), $constraint['foreignTable'],
+                array_values($constraint['foreign']), $constraint['name'],
+                array(
+                    'onDelete' => $constraint['onDelete'],
+                    'onUpdate' => $constraint['onUpdate'],
+                )
+            );
         }
 
-        return new ForeignKeyConstraint(
-            (array)$tableForeignKey['column_name'],
-            $tableForeignKey['referenced_table_name'],
-            (array)$tableForeignKey['referenced_column_name'],
-            $tableForeignKey['constraint_name'],
-            array(
-                'onUpdate' => $tableForeignKey['update_rule'],
-                'onDelete' => $tableForeignKey['delete_rule'],
-            )
-        );
+        return $result;
     }
-}
+}

vendor/doctrine-dbal/lib/Doctrine/DBAL/Schema/Table.php

@@ -167,7 +167,7 @@ class Table extends AbstractAsset
      */
     public function addUniqueIndex(array $columnNames, $indexName = null)
     {
-        if ($indexName == null) {
+        if ($indexName === null) {
             $indexName = $this->_generateIdentifierName(
                 array_merge(array($this->getName()), $columnNames), "uniq", $this->_getMaxIdentifierLength()
             );

vendor/doctrine-dbal/lib/Doctrine/DBAL/Types/BigIntType.php

@@ -43,6 +43,6 @@ class BigIntType extends Type
 
     public function getBindingType()
     {
-        return \PDO::PARAM_INT;
+        return \PDO::PARAM_STR;
     }
 }

vendor/doctrine-dbal/lib/Doctrine/DBAL/Version.php

@@ -36,7 +36,7 @@ class Version
     /**
      * Current Doctrine Version
      */
-    const VERSION = '2.1.5-DEV';
+    const VERSION = '2.1.7-DEV';
 
     /**
      * Compares a Doctrine version with the current one.

vendor/doctrine-dbal/tests/Doctrine/Tests/DBAL/Functional/Schema/SchemaManagerFunctionalTestCase.php

@@ -31,6 +31,19 @@ class SchemaManagerFunctionalTestCase extends \Doctrine\Tests\DbalFunctionalTest
         $this->_sm = $this->_conn->getSchemaManager();
     }
 
+    /**
+     * @group DBAL-195
+     */
+    public function testDropAndCreateSequence()
+    {
+        if(!$this->_conn->getDatabasePlatform()->supportsSequences()) {
+            $this->markTestSkipped($this->_conn->getDriver()->getName().' does not support sequences.');
+        }
+
+        $sequence = new \Doctrine\DBAL\Schema\Sequence('dropcreate_sequences_test_seq', 20, 10);
+        $this->_sm->dropAndCreateSequence($sequence);
+    }
+
     public function testListSequences()
     {
         if(!$this->_conn->getDatabasePlatform()->supportsSequences()) {
@@ -522,4 +535,5 @@ class SchemaManagerFunctionalTestCase extends \Doctrine\Tests\DbalFunctionalTest
         }
         $this->assertTrue($foundTable, "Could not find new table");
     }
-}
+}
+

vendor/doctrine-dbal/tests/Doctrine/Tests/DBAL/Platforms/AbstractPlatformTestCase.php

@@ -205,6 +205,16 @@ abstract class AbstractPlatformTestCase extends \Doctrine\Tests\DbalTestCase
         $this->assertEquals($this->getAlterTableColumnCommentsSQL(), $this->_platform->getAlterTableSQL($tableDiff));
     }
 
+    public function testCreateTableColumnTypeComments()
+    {
+        $table = new \Doctrine\DBAL\Schema\Table('test');
+        $table->addColumn('id', 'integer');
+        $table->addColumn('data', 'array');
+        $table->setPrimaryKey(array('id'));
+
+        $this->assertEquals($this->getCreateTableColumnTypeCommentsSQL(), $this->_platform->getCreateTableSQL($table));
+    }
+
     public function getCreateTableColumnCommentsSQL()
     {
         $this->markTestSkipped('Platform does not support Column comments.');
@@ -214,7 +224,12 @@ abstract class AbstractPlatformTestCase extends \Doctrine\Tests\DbalTestCase
     {
         $this->markTestSkipped('Platform does not support Column comments.');
     }
-    
+
+    public function getCreateTableColumnTypeCommentsSQL()
+    {
+        $this->markTestSkipped('Platform does not support Column comments.');
+    }
+
     /**
      * @group DBAL-45
      */

vendor/doctrine-dbal/tests/Doctrine/Tests/DBAL/Platforms/MySqlPlatformTest.php

@@ -204,4 +204,9 @@ class MySqlPlatformTest extends AbstractPlatformTestCase
     {
         return array("ALTER TABLE mytable ADD quota INT NOT NULL COMMENT 'A comment', CHANGE bar baz VARCHAR(255) NOT NULL COMMENT 'B comment'");
     }
+
+    public function getCreateTableColumnTypeCommentsSQL()
+    {
+        return array("CREATE TABLE test (id INT NOT NULL, data LONGTEXT NOT NULL COMMENT '(DC2Type:array)', PRIMARY KEY(id)) ENGINE = InnoDB");
+    }
 }

vendor/doctrine-dbal/tests/Doctrine/Tests/DBAL/Platforms/OraclePlatformTest.php

@@ -195,6 +195,14 @@ class OraclePlatformTest extends AbstractPlatformTestCase
         );
     }
 
+    public function getCreateTableColumnTypeCommentsSQL()
+    {
+        return array(
+            "CREATE TABLE test (id NUMBER(10) NOT NULL, data CLOB NOT NULL, PRIMARY KEY(id))",
+            "COMMENT ON COLUMN test.data IS '(DC2Type:array)'"
+        );
+    }
+
     public function getAlterTableColumnCommentsSQL()
     {
         return array(

vendor/doctrine-dbal/tests/Doctrine/Tests/DBAL/Platforms/PostgreSqlPlatformTest.php

@@ -216,4 +216,12 @@ class PostgreSqlPlatformTest extends AbstractPlatformTestCase
             "COMMENT ON COLUMN mytable.baz IS 'B comment'",
         );
     }
+
+    public function getCreateTableColumnTypeCommentsSQL()
+    {
+        return array(
+            "CREATE TABLE test (id INT NOT NULL, data TEXT NOT NULL, PRIMARY KEY(id))",
+            "COMMENT ON COLUMN test.data IS '(DC2Type:array)'"
+        );
+    }
 }

vendor/doctrine-dbal/tests/Doctrine/Tests/DBAL/Schema/MySqlSchemaManagerTest.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace Doctrine\Tests\DBAL\Schema;
+
+require_once __DIR__ . '/../../TestInit.php';
+
+use Doctrine\Common\EventManager;
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Configuration;
+use Doctrine\DBAL\Events;
+use Doctrine\DBAL\Schema\MySqlSchemaManager;
+use Doctrine\Tests\DBAL\Mocks;
+use Doctrine\Tests\TestUtil;
+
+class MySqlSchemaManagerTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     *
+     * @var \Doctrine\DBAL\Schema\AbstractSchemaManager
+     */
+    private $manager;
+
+    public function setUp()
+    {
+        $eventManager = new EventManager();
+        $driverMock = $this->getMock('Doctrine\DBAL\Driver');
+        $platform = $this->getMock('Doctrine\DBAL\Platforms\MySqlPlatform');
+        $this->conn = $this->getMock(
+            'Doctrine\DBAL\Connection',
+            array('fetchAll'),
+            array(array('platform' => $platform), $driverMock, new Configuration(), $eventManager)
+        );
+        $this->manager = new MySqlSchemaManager($this->conn);
+    }
+
+    public function testCompositeForeignKeys()
+    {
+        $this->conn->expects($this->once())->method('fetchAll')->will($this->returnValue($this->getFKDefinition()));
+        $fkeys = $this->manager->listTableForeignKeys('dummy');
+        $this->assertEquals(1, count($fkeys), "Table has to have one foreign key.");
+
+        $this->assertInstanceOf('Doctrine\DBAL\Schema\ForeignKeyConstraint', $fkeys[0]);
+        $this->assertEquals(array('column_1', 'column_2', 'column_3'), array_map('strtolower', $fkeys[0]->getLocalColumns()));
+        $this->assertEquals(array('column_1', 'column_2', 'column_3'), array_map('strtolower', $fkeys[0]->getForeignColumns()));
+    }
+
+    public function getFKDefinition()
+    {
+        return array(
+            array(
+                "CONSTRAINT_NAME" => "FK_C1B1712387FE737264DE5A5511B8B3E",
+                "COLUMN_NAME" => "column_1",
+                "REFERENCED_TABLE_NAME" => "dummy",
+                "REFERENCED_COLUMN_NAME" => "column_1",
+                "update_rule" => "RESTRICT",
+                "delete_rule" => "RESTRICT",
+            ),
+            array(
+                "CONSTRAINT_NAME" => "FK_C1B1712387FE737264DE5A5511B8B3E",
+                "COLUMN_NAME" => "column_2",
+                "REFERENCED_TABLE_NAME" => "dummy",
+                "REFERENCED_COLUMN_NAME" => "column_2",
+                "update_rule" => "RESTRICT",
+                "delete_rule" => "RESTRICT",
+            ),
+            array(
+                "CONSTRAINT_NAME" => "FK_C1B1712387FE737264DE5A5511B8B3E",
+                "COLUMN_NAME" => "column_3",
+                "REFERENCED_TABLE_NAME" => "dummy",
+                "REFERENCED_COLUMN_NAME" => "column_3",
+                "update_rule" => "RESTRICT",
+                "delete_rule" => "RESTRICT",
+            )
+        );
+    }
+}

vendor/doctrine-fixtures

@@ -1 +1 @@
-Subproject commit 738983423b12d80a127424cd0ade6c45a633a706
+Subproject commit ffee818a6e3af526b774de11b690a36512fa6235

vendor/doctrine/build.xml

@@ -92,10 +92,10 @@
            <dependencies>
                <php minimum_version="5.3.0" />
                <pear minimum_version="1.6.0" recommended_version="1.6.1" />
-               <package name="DoctrineCommon" channel="pear.doctrine-project.org" minimum_version="${dependencies.common}" />
-               <package name="DoctrineDBAL" channel="pear.doctrine-project.org" minimum_version="${dependencies.dbal}" />
-               <package name="Console" channel="pear.symfony.org" minimum_version="2.0.0" />
-               <package name="Yaml" channel="pear.symfony.org" minimum_version="2.0.0" />
+               <package name="DoctrineCommon" channel="pear.doctrine-project.org" minimum_version="${dependencies.common}" maximum_version="2.1.99" />
+               <package name="DoctrineDBAL" channel="pear.doctrine-project.org" minimum_version="${dependencies.dbal}" maximum_version="2.1.99" />
+               <package name="Console" channel="pear.symfony.com" minimum_version="2.0.0" />
+               <package name="Yaml" channel="pear.symfony.com" minimum_version="2.0.0" />
            </dependencies>
            <dirroles key="bin">script</dirroles>
            <ignore>Doctrine/Common/</ignore>

vendor/doctrine/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "doctrine/orm",
-    "type": "library","version":"2.1.5",
+    "type": "library","version":"2.1.6",
     "description": "Object-Relational-Mapper for PHP",
     "keywords": ["orm", "database"],
     "homepage": "http://www.doctrine-project.org",

vendor/doctrine/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php

@@ -313,7 +313,6 @@ class ObjectHydrator extends AbstractHydrator
                     continue;
                 }
 
-
                 $parentClass = $this->_ce[$this->_rsm->aliasMap[$parentAlias]];
                 $oid = spl_object_hash($parentObject);
                 $relationField = $this->_rsm->relationMap[$dqlAlias];
@@ -322,6 +321,7 @@ class ObjectHydrator extends AbstractHydrator
 
                 // Check the type of the relation (many or single-valued)
                 if ( ! ($relation['type'] & ClassMetadata::TO_ONE)) {
+                    $reflFieldValue = $reflField->getValue($parentObject);
                     // PATH A: Collection-valued association
                     if (isset($nonemptyComponents[$dqlAlias])) {
                         $collKey = $oid . $relationField;
@@ -363,9 +363,12 @@ class ObjectHydrator extends AbstractHydrator
                             // Update result pointer
                             $this->_resultPointers[$dqlAlias] = $reflFieldValue[$index];
                         }
-                    } else if ( ! $reflField->getValue($parentObject)) {
+                    } else if ( ! $reflFieldValue) {
                         $reflFieldValue = $this->_initRelatedCollection($parentObject, $parentClass, $relationField, $parentAlias);
+                    } else if ($reflFieldValue instanceof PersistentCollection && $reflFieldValue->isInitialized() === false) {
+                        $reflFieldValue->setInitialized(true);
                     }
+
                 } else {
                     // PATH B: Single-valued association
                     $reflFieldValue = $reflField->getValue($parentObject);

vendor/doctrine/lib/Doctrine/ORM/Query/Expr.php

@@ -73,7 +73,7 @@ class Expr
      * Creates an ASCending order expression.
      *
      * @param $sort
-     * @return OrderBy
+     * @return Expr\OrderBy
      */
     public function asc($expr)
     {
@@ -84,7 +84,7 @@ class Expr
      * Creates a DESCending order expression.
      *
      * @param $sort
-     * @return OrderBy
+     * @return Expr\OrderBy
      */
     public function desc($expr)
     {

vendor/doctrine/lib/Doctrine/ORM/Query/Expr/Composite.php

@@ -39,30 +39,30 @@ class Composite extends Base
         if ($this->count() === 1) {
             return (string) $this->_parts[0];
         }
-        
+
         $components = array();
-        
+
         foreach ($this->_parts as $part) {
             $components[] = $this->processQueryPart($part);
         }
-        
+
         return implode($this->_separator, $components);
     }
-    
-    
+
+
     private function processQueryPart($part)
     {
         $queryPart = (string) $part;
-        
+
         if (is_object($part) && $part instanceof self && $part->count() > 1) {
             return $this->_preSeparator . $queryPart . $this->_postSeparator;
         }
-        
+
         // Fixes DDC-1237: User may have added a where item containing nested expression (with "OR" or "AND")
-        if (mb_stripos($queryPart, ' OR ') !== false || mb_stripos($queryPart, ' AND ') !== false) {
+        if (stripos($queryPart, ' OR ') !== false || stripos($queryPart, ' AND ') !== false) {
             return $this->_preSeparator . $queryPart . $this->_postSeparator;
         }
-        
+
         return $queryPart;
     }
-}
+}

vendor/doctrine/lib/Doctrine/ORM/Query/SqlWalker.php

@@ -36,6 +36,11 @@ use Doctrine\DBAL\LockMode,
 class SqlWalker implements TreeWalker
 {
     /**
+     * @var string
+     */
+    const HINT_DISTINCT = 'doctrine.distinct';
+  
+    /**
      * @var ResultSetMapping
      */
     private $_rsm;
@@ -516,6 +521,10 @@ class SqlWalker implements TreeWalker
         $sql = 'SELECT ' . (($selectClause->isDistinct) ? 'DISTINCT ' : '');
         $sqlSelectExpressions = array_filter(array_map(array($this, 'walkSelectExpression'), $selectClause->selectExpressions));
 
+        if ($this->_query->getHint(Query::HINT_INTERNAL_ITERATION) == true && $selectClause->isDistinct) {
+            $this->_query->setHint(self::HINT_DISTINCT, true);
+        }
+
         $addMetaColumns = ! $this->_query->getHint(Query::HINT_FORCE_PARTIAL_LOAD) &&
                 $this->_query->getHydrationMode() == Query::HYDRATE_OBJECT
                 ||
@@ -736,8 +745,7 @@ class SqlWalker implements TreeWalker
 
         // Ensure we got the owning side, since it has all mapping info
         $assoc = ( ! $relation['isOwningSide']) ? $targetClass->associationMappings[$relation['mappedBy']] : $relation;
-
-        if ($this->_query->getHint(Query::HINT_INTERNAL_ITERATION) == true) {
+        if ($this->_query->getHint(Query::HINT_INTERNAL_ITERATION) == true && (!$this->_query->getHint(self::HINT_DISTINCT) || isset($this->_selectedClasses[$joinedDqlAlias]))) {
             if ($relation['type'] == ClassMetadata::ONE_TO_MANY || $relation['type'] == ClassMetadata::MANY_TO_MANY) {
                 throw QueryException::iterateWithFetchJoinNotAllowed($assoc);
             }

vendor/doctrine/lib/Doctrine/ORM/QueryBuilder.php

@@ -50,6 +50,7 @@ class QueryBuilder
      * @var array The array of DQL parts collected.
      */
     private $_dqlParts = array(
+        'distinct' => false,
         'select'  => array(),
         'from'    => array(),
         'join'    => array(),
@@ -119,7 +120,7 @@ class QueryBuilder
      * For more complex expression construction, consider storing the expression
      * builder object in a local variable.
      *
-     * @return Expr
+     * @return Query\Expr
      */
     public function expr()
     {
@@ -342,8 +343,8 @@ class QueryBuilder
      *         ->from('User', 'u')
      *         ->where('u.id = :user_id1 OR u.id = :user_id2')
      *         ->setParameters(array(
-     *             ':user_id1' => 1,
-     *             ':user_id2' => 2
+     *             'user_id1' => 1,
+     *             'user_id2' => 2
      *         ));
      * </code>
      *
@@ -503,6 +504,25 @@ class QueryBuilder
     }
 
     /**
+     * Add a DISTINCT flag to this query.
+     *
+     * <code>
+     *     $qb = $em->createQueryBuilder()
+     *         ->select('u')
+     *         ->distinct()
+     *         ->from('User', 'u');
+     * </code>
+     *
+     * @param bool
+     * @return QueryBuilder
+     */
+    public function distinct($flag = true)
+    {
+        $this->_dqlParts['distinct'] = (bool) $flag;
+        return $this;
+    }
+
+    /**
      * Adds an item that is to be returned in the query result.
      *
      * <code>
@@ -973,8 +993,10 @@ class QueryBuilder
 
     private function _getDQLForSelect()
     {
-        $dql = 'SELECT' . $this->_getReducedDQLQueryPart('select', array('pre' => ' ', 'separator' => ', '));
-        
+        $dql = 'SELECT'
+              . ($this->_dqlParts['distinct']===true ? ' DISTINCT' : '')
+              . $this->_getReducedDQLQueryPart('select', array('pre' => ' ', 'separator' => ', '));
+
         $fromParts   = $this->getDQLPart('from');
         $joinParts   = $this->getDQLPart('join');
         $fromClauses = array();
@@ -1082,4 +1104,4 @@ class QueryBuilder
             }
         }
     }
-}
+}

vendor/doctrine/lib/Doctrine/ORM/Tools/EntityGenerator.php

@@ -189,6 +189,8 @@ public function <methodName>()
 
         if ( ! $this->_isNew) {
             $this->_parseTokensInEntityFile(file_get_contents($path));
+        } else {
+            $this->_staticReflection[$metadata->name] = array('properties' => array(), 'methods' => array());
         }
 
         if ($this->_backupExisting && file_exists($path)) {
@@ -1061,4 +1063,4 @@ public function <methodName>()
                 throw new \InvalidArgumentException('Invalid provided IdGeneratorType: ' . $type);
         }
     }
-}
+}

vendor/doctrine/lib/Doctrine/ORM/Tools/SchemaTool.php

@@ -217,13 +217,13 @@ class SchemaTool
 
             if (isset($class->table['indexes'])) {
                 foreach ($class->table['indexes'] AS $indexName => $indexData) {
-                    $table->addIndex($indexData['columns'], $indexName);
+                    $table->addIndex($indexData['columns'], is_numeric($indexName) ? null : $indexName);
                 }
             }
 
             if (isset($class->table['uniqueConstraints'])) {
                 foreach ($class->table['uniqueConstraints'] AS $indexName => $indexData) {
-                    $table->addUniqueIndex($indexData['columns'], $indexName);
+                    $table->addUniqueIndex($indexData['columns'], is_numeric($indexName) ? null : $indexName);
                 }
             }
 

vendor/doctrine/lib/Doctrine/ORM/UnitOfWork.php

@@ -1453,6 +1453,15 @@ class UnitOfWork implements PropertyChangedListener
                     } else {
                         throw new EntityNotFoundException;
                     }
+
+                    $managedCopy = $this->newInstance($class);
+                    $class->setIdentifierValues($managedCopy, $id);
+
+                    $this->persistNew($class, $managedCopy);
+                } else {
+                    if ($managedCopy instanceof Proxy && ! $managedCopy->__isInitialized__) {
+                        $managedCopy->__load();
+                    }
                 }
             }
 

vendor/doctrine/lib/Doctrine/ORM/Version.php

@@ -36,7 +36,7 @@ class Version
     /**
      * Current Doctrine Version
      */
-    const VERSION = '2.1.5';
+    const VERSION = '2.1.6';
 
     /**
      * Compares a Doctrine version with the current one.

vendor/doctrine/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1526Test.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+/**
+ * @group DDC-1526
+ */
+class DDC1526Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+        $this->_schemaTool->createSchema(array(
+            $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1526Menu'),
+        ));
+    }
+
+    public function testIssue()
+    {
+        $parents = array();
+        for ($i = 0; $i < 9; $i++) {
+            $entity = new DDC1526Menu;
+
+            if (isset ($parents[($i % 3)])) {
+                $entity->parent = $parents[($i%3)];
+            }
+
+            $this->_em->persist($entity);
+            $parents[$i] = $entity;
+        }
+        $this->_em->flush();
+        $this->_em->clear();
+
+
+        $dql = "SELECT m, c
+            FROM " . __NAMESPACE__ . "\DDC1526Menu m
+            LEFT JOIN m.children c";
+        $menus = $this->_em->createQuery($dql)->getResult();
+
+        // All Children collection now have to be initiailzed
+        foreach ($menus as $menu) {
+            $this->assertTrue($menu->children->isInitialized());
+        }
+    }
+}
+
+/**
+ * @Entity
+ */
+class DDC1526Menu
+{
+    /**
+     * @Column(type="integer")
+     * @Id
+     * @GeneratedValue
+     */
+    public $id;
+    /**
+     * @ManyToOne(targetEntity="DDC1526Menu", inversedBy="children")
+     */
+    public $parent;
+
+    /**
+     * @OneToMany(targetEntity="DDC1526Menu", mappedBy="parent")
+     */
+    public $children;
+}

vendor/doctrine/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1594Test.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Common\Collections\ArrayCollection;
+
+use Doctrine\Tests\Models\CMS\CmsComment;
+use Doctrine\Tests\Models\CMS\CmsArticle;
+use Doctrine\Tests\Models\CMS\CmsUser;
+
+/**
+ * @group DDC-1594
+ */
+class DDC1594Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    public function setUp()
+    {
+        $this->useModelSet('cms');
+        parent::setUp();
+    }
+
+    public function testIssue()
+    {
+        $user = new CmsUser();
+        $user->status = 'foo';
+        $user->username = 'foo';
+        $user->name = 'foo';
+
+        $this->_em->persist($user);
+        $this->_em->flush();
+
+        $this->_em->clear();
+        $detachedUser = clone $user;
+        $detachedUser->name = 'bar';
+        $detachedUser->status = 'bar';
+
+        $newUser = $this->_em->getReference(get_class($user), $user->id);
+
+        $mergedUser = $this->_em->merge($detachedUser);
+
+        $this->assertNotSame($mergedUser, $detachedUser);
+        $this->assertEquals('bar', $detachedUser->getName());
+        $this->assertEquals('bar', $mergedUser->getName());
+    }
+}

vendor/doctrine/tests/Doctrine/Tests/ORM/Query/QueryTest.php

@@ -90,4 +90,28 @@ class QueryTest extends \Doctrine\Tests\OrmTestCase
         $this->assertEquals('baz', $q->getHint('bar'));
         $this->assertEquals(array('foo' => 'bar', 'bar' => 'baz'), $q->getHints());
     }
+    
+    /**
+     * @expectedException Doctrine\ORM\Query\QueryException
+     **/
+    public function testIterateWithNoDistinctAndWrongSelectClause()
+    {
+        $q = $this->_em->createQuery("select u, a from Doctrine\Tests\Models\CMS\CmsUser u LEFT JOIN u.articles a");
+        $q->iterate();
+    }
+    
+    /**
+     * @expectedException Doctrine\ORM\Query\QueryException
+     **/
+    public function testIterateWithNoDistinctAndWithValidSelectClause()
+    {
+        $q = $this->_em->createQuery("select u from Doctrine\Tests\Models\CMS\CmsUser u LEFT JOIN u.articles a");
+        $q->iterate();
+    }
+    
+    public function testIterateWithDistinct()
+    {
+        $q = $this->_em->createQuery("SELECT DISTINCT u from Doctrine\Tests\Models\CMS\CmsUser u LEFT JOIN u.articles a");
+        $q->iterate();
+    }
 }

vendor/doctrine/tests/Doctrine/Tests/ORM/QueryBuilderTest.php

@@ -732,4 +732,17 @@ class QueryBuilderTest extends \Doctrine\Tests\OrmTestCase
         
         $this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u', $qb->getDQL());
     }
-}
+
+    /**
+     * @group DDC-1619
+     */
+    public function testAddDistinct()
+    {
+        $qb = $this->_em->createQueryBuilder()
+            ->select('u')
+            ->distinct()
+            ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u');
+
+        $this->assertEquals('SELECT DISTINCT u FROM Doctrine\Tests\Models\CMS\CmsUser u', $qb->getDQL());
+    }
+}

vendor/swiftmailer/CHANGES

@@ -1,6 +1,15 @@
 Changelog since Version 4.1.x
 =============================
 
+4.1.5 (2012-01-04)
+------------------
+
+ * enforced Swift_Spool::queueMessage() to return a Boolean
+ * made an optimization to the memory spool: start the transport only when required
+ * prevented stream_socket_client() from generating an error and throw a Swift_TransportException instead
+ * fixed a PHP warning when calling to mail() when safe_mode is off
+ * many doc tweaks
+
 4.1.4 (2011-12-16)
 ------------------
 

vendor/swiftmailer/VERSION

@@ -1 +1 @@
-Swift-4.1.4
+Swift-4.1.5

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.4",
+    "version": "4.1.5",
     "license": "LGPL",
     "authors": [
         {

vendor/swiftmailer/doc/headers.rst

@@ -12,20 +12,18 @@ All MIME entities in Swift Mailer -- including the message itself --
 store their headers in a single object called a HeaderSet. This HeaderSet is
 retrieved with the ``getHeaders()`` method.
 
-As mentioned in the previous chapter, everything that forms a part of a
-message in Swift Mailer is a MIME entity that is represented by an instance of
-``Swift_Mime_MimeEntity``. This includes -- most notably -- the
-message object itself, attachments, MIME parts and embedded images. Each of
-these MIME entities consists of a body and a set of headers that describe the
-body.
+As mentioned in the previous chapter, everything that forms a part of a message
+in Swift Mailer is a MIME entity that is represented by an instance of
+``Swift_Mime_MimeEntity``. This includes -- most notably -- the message object
+itself, attachments, MIME parts and embedded images. Each of these MIME entities
+consists of a body and a set of headers that describe the body.
 
 For all of the "standard" headers in these MIME entities, such as the
-``Content-Type``, there are named methods for working with them,
-such as ``setContentType()`` and
-``getContentType()``. This is because headers are a moderately
-complex area of the library. Each header has a slightly different required
-structure that it must meet in order to comply with the standards that govern
-email (and that are checked by spam blockers etc).
+``Content-Type``, there are named methods for working with them, such as 
+``setContentType()`` and ``getContentType()``. This is because headers are a
+moderately complex area of the library. Each header has a slightly different
+required structure that it must meet in order to comply with the standards that
+govern email (and that are checked by spam blockers etc).
 
 You fetch the HeaderSet from a MIME entity like so:
 
@@ -33,12 +31,12 @@ You fetch the HeaderSet from a MIME entity like so:
 
     $message = Swift_Message::newInstance();
 
-    //Fetch the HeaderSet from a Message object
+    // Fetch the HeaderSet from a Message object
     $headers = $message->getHeaders();
 
     $attachment = Swift_Attachment::fromPath('document.pdf');
 
-    //Fetch the HeaderSet from an attachment object
+    // Fetch the HeaderSet from an attachment object
     $headers = $attachment->getHeaders();
 
 The job of the HeaderSet is to contain and manage instances of Header objects.
@@ -66,8 +64,8 @@ the names of the headers:
     To
     */
 
-You can also dump out the rendered HeaderSet by calling its
-``toString()`` method:
+You can also dump out the rendered HeaderSet by calling its ``toString()`` 
+method:
 
 .. code-block:: php
 
@@ -87,17 +85,15 @@ You can also dump out the rendered HeaderSet by calling its
 Where the complexity comes in is when you want to modify an existing header.
 This complexity comes from the fact that each header can be of a slightly
 different type (such as a Date header, or a header that contains email
-addresses, or a header that has key-value parameters on it!). Each
-header in the HeaderSet is an instance of ``Swift_Mime_Header``.
-They all have common functionality, but knowing exactly what type of header
-you're working with will allow you a little more control.
+addresses, or a header that has key-value parameters on it!). Each header in the
+HeaderSet is an instance of ``Swift_Mime_Header``. They all have common 
+functionality, but knowing exactly what type of header you're working with will
+allow you a little more control.
 
 You can determine the type of header by comparing the return value of its
-``getFieldType()`` method with the constants
-``TYPE_TEXT``, ``TYPE_PARAMETERIZED``,
-``TYPE_DATE``, ``TYPE_MAILBOX``,
-``TYPE_ID`` and ``TYPE_PATH`` which are defined in
-``Swift_Mime_Header``.
+``getFieldType()`` method with the constants ``TYPE_TEXT``,
+``TYPE_PARAMETERIZED``, ``TYPE_DATE``, ``TYPE_MAILBOX``, ``TYPE_ID`` and
+``TYPE_PATH`` which are defined in ``Swift_Mime_Header``.
 
 
 .. code-block:: php
@@ -141,10 +137,10 @@ exist within the HeaderSet.
 Header Types
 ------------
 
-Because all headers are modeled on different data (dates, addresses,
-text!) there are different types of Header in Swift Mailer. Swift Mailer
-attempts to categorize all possible MIME headers into more general groups,
-defined by a small number of classes.
+Because all headers are modeled on different data (dates, addresses, text!)
+there are different types of Header in Swift Mailer. Swift Mailer attempts to
+categorize all possible MIME headers into more general groups, defined by a
+small number of classes.
 
 Text Headers
 ~~~~~~~~~~~~
@@ -160,9 +156,9 @@ contains characters that are not permitted in a message header (such as new
 lines, or non-ascii characters) then the header takes care of encoding the
 text so that it can be used.
 
-No header -- including text headers -- in Swift Mailer is vulnerable
-to header-injection attacks. Swift Mailer breaks any attempt at header
-injection by encoding the dangerous data into a non-dangerous form.
+No header -- including text headers -- in Swift Mailer is vulnerable to
+header-injection attacks. Swift Mailer breaks any attempt at header injection by
+encoding the dangerous data into a non-dangerous form.
 
 It's easy to add a new text header to a HeaderSet. You do this by calling the
 HeaderSet's ``addTextHeader()`` method.
@@ -184,8 +180,8 @@ Changing the value of an existing text header is done by calling it's
 
     $subject->setValue('new subject');
 
-When output via ``toString()``, a text header produces something
-like the following:
+When output via ``toString()``, a text header produces something like the
+following:
 
 .. code-block:: php
 
@@ -228,9 +224,8 @@ parameterized header since it contains charset information after the content
 type.
 
 The parameterized header type is a special type of text header. It extends the
-text header by allowing additional information to follow it. All of the
-methods from text headers are available in addition to the methods described
-here.
+text header by allowing additional information to follow it. All of the methods
+from text headers are available in addition to the methods described here.
 
 Adding a parameterized header to a HeaderSet is done by using the
 ``addParameterizedHeader()`` method which takes a text value like
@@ -248,28 +243,27 @@ key-value parameters.
       array('foo' => 'bar')
       );
 
-To change the text value of the header, call it's ``setValue()``
-method just as you do with text headers.
+To change the text value of the header, call it's ``setValue()`` method just as
+you do with text headers.
 
-To change the parameters in the header, call the header's
-``setParameters()`` method or the ``setParameter()``
-method (note the pluralization).
+To change the parameters in the header, call the header's ``setParameters()``
+method or the ``setParameter()`` method (note the pluralization).
 
 .. code-block:: php
 
     $type = $message->getHeaders()->get('Content-Type');
 
-    //setParameters() takes an associative array
+    // setParameters() takes an associative array
     $type->setParameters(array(
       'name' => 'file.txt',
       'charset' => 'iso-8859-1'
       ));
 
-    //setParameter() takes two args for $key and $value
+    // setParameter() takes two args for $key and $value
     $type->setParameter('charset', 'iso-8859-1');
 
-When output via ``toString()``, a parameterized header produces
-something like the following:
+When output via ``toString()``, a parameterized header produces something like
+the following:
 
 .. code-block:: php
 
@@ -312,17 +306,17 @@ encoded so that they can be transmitted safely.
 Date Headers
 ~~~~~~~~~~~~
 
-Date headers contains an RFC 2822 formatted date (i.e. what PHP's
-``date('r')`` returns). They are used anywhere a date or time is
-needed to be presented as a message header.
+Date headers contains an RFC 2822 formatted date (i.e. what PHP's ``date('r')``
+returns). They are used anywhere a date or time is needed to be presented as a
+message header.
 
-The data on which a date header is modeled is simply a UNIX timestamp such as that
-returned by ``time()`` or ``strtotime()``.  The timestamp
-is used to create a correctly structured RFC 2822 formatted date such as
+The data on which a date header is modeled is simply a UNIX timestamp such as 
+that returned by ``time()`` or ``strtotime()``.  The timestamp is used to create 
+a correctly structured RFC 2822 formatted date such as
 ``Tue, 17 Feb 2009 22:26:31 +1100``.
 
-The obvious place this header type is used is in the ``Date:`` header
-of the message itself.
+The obvious place this header type is used is in the ``Date:`` header of the 
+message itself.
 
 It's easy to add a new date header to a HeaderSet.  You do this by calling
 the HeaderSet's ``addDateHeader()`` method.
@@ -344,8 +338,8 @@ Changing the value of an existing date header is done by calling it's
 
     $date->setTimestamp(time());
 
-When output via ``toString()``, a date header produces something
-like the following:
+When output via ``toString()``, a date header produces something like the 
+following:
 
 .. code-block:: php
 
@@ -367,13 +361,12 @@ personalized names attached to them. The data on which they are modeled is
 represented by an associative array of email addresses and names.
 
 Mailbox headers are probably the most complex header type to understand in
-Swift Mailer because they accept their input as an array which can take
-various forms, as described in the previous chapter.
+Swift Mailer because they accept their input as an array which can take various
+forms, as described in the previous chapter.
 
 All of the headers that contain e-mail addresses in a message -- with the
-exception of ``Return-Path:`` which has a stricter syntax --
-use this header type. That is, ``To:``, ``From:``
-etc.
+exception of ``Return-Path:`` which has a stricter syntax -- use this header
+type. That is, ``To:``, ``From:`` etc.
 
 You add a new mailbox header to a HeaderSet by calling the HeaderSet's
 ``addMailboxHeader()`` method.
@@ -433,8 +426,8 @@ string as the input parameter to ``setAddresses()`` and/or
 
     $to->setAddresses('joe-bloggs@example.org');
 
-When output via ``toString()``, a mailbox header produces
-something like the following:
+When output via ``toString()``, a mailbox header produces something like the
+following:
 
 .. code-block:: php
 
@@ -463,14 +456,14 @@ notable ID header is the Message-ID header on the message itself.
 
 An ID that exists inside an ID header looks more-or-less less like an email
 address.  For example, ``<![CDATA[<1234955437.499becad62ec2@example.org>]]>``.
-The part to the left of the @ sign is usually unique, based on the current time and
-some random factor.  The part on the right is usually a domain name.
+The part to the left of the @ sign is usually unique, based on the current time 
+and some random factor. The part on the right is usually a domain name.
 
-Any ID passed the an ID header's ``setId()`` method absolutely
-MUST conform to this structure, otherwise you'll get an Exception thrown at you
-by Swift Mailer (a ``Swift_RfcComplianceException``).  This is to
-ensure that the generated email complies with relevant RFC documents and therefore
-is less likely to be blocked as spam.
+Any ID passed the an ID header's ``setId()`` method absolutely MUST conform to 
+this structure, otherwise you'll get an Exception thrown at you by Swift Mailer 
+(a ``Swift_RfcComplianceException``).  This is to ensure that the generated 
+email complies with relevant RFC documents and therefore is less likely to be 
+blocked as spam.
 
 It's easy to add a new ID header to a HeaderSet.  You do this by calling
 the HeaderSet's ``addIdHeader()`` method.
@@ -492,8 +485,8 @@ Changing the value of an existing date header is done by calling its
 
     $msgId->setId(time() . '.' . uniqid('thing') . '@example.org');
 
-When output via ``toString()``, an ID header produces something
-like the following:
+When output via ``toString()``, an ID header produces something like the
+following:
 
 .. code-block:: php
 
@@ -535,8 +528,8 @@ Changing the value of an existing path header is done by calling its
 
     $return->setAddress('my-address@example.org');
 
-When output via ``toString()``, a path header produces something
-like the following:
+When output via ``toString()``, a path header produces something like the
+following:
 
 .. code-block:: php
 
@@ -566,8 +559,7 @@ New headers can be added to the HeaderSet by using one of the provided
 
 To add a header to a MIME entity (such as the message):
 
-Get the HeaderSet from the entity by via its ``getHeaders()``
-method.
+Get the HeaderSet from the entity by via its ``getHeaders()`` method.
 
 * Add the header to the HeaderSet by calling one of the ``add..Header()``
   methods.
@@ -576,20 +568,20 @@ The added header will appear in the message when it is sent.
 
 .. code-block:: php
 
-    //Adding a custom header to a message
+    // Adding a custom header to a message
     $message = Swift_Message::newInstance();
     $headers = $message->getHeaders();
     $headers->addTextHeader('X-Mine', 'something here');
 
-    //Adding a custom header to an attachment
+    // Adding a custom header to an attachment
     $attachment = Swift_Attachment::fromPath('/path/to/doc.pdf');
     $attachment->getHeaders()->addDateHeader('X-Created-Time', time());
 
 Retrieving Headers
 ~~~~~~~~~~~~~~~~~~
 
-Headers are retrieved through the HeaderSet's ``get()`` and
-``getAll()`` methods.
+Headers are retrieved through the HeaderSet's ``get()`` and ``getAll()``
+methods.
 
 To get a header, or several headers from a MIME entity:
 
@@ -598,11 +590,10 @@ To get a header, or several headers from a MIME entity:
 * Get the header(s) from the HeaderSet by calling either ``get()`` or
   ``getAll()``.
 
-When using ``get()`` a single header is returned that matches the
-name (case insensitive) that is passed to it. When using
-``getAll()`` with a header name, an array of headers with that
-name are returned. Calling ``getAll()`` with no arguments returns
-an array of all headers present in the entity.
+When using ``get()`` a single header is returned that matches the name (case
+insensitive) that is passed to it. When using ``getAll()`` with a header name,
+an array of headers with that name are returned. Calling ``getAll()`` with no
+arguments returns an array of all headers present in the entity.
 
 .. note::
 
@@ -622,16 +613,16 @@ an array of all headers present in the entity.
 
         $headers = $message->getHeaders();
 
-        //Get the To: header
+        // Get the To: header
         $toHeader = $headers->get('To');
 
-        //Get all headers named "X-Foo"
+        // Get all headers named "X-Foo"
         $fooHeaders = $headers->getAll('X-Foo');
 
-        //Get the second header named "X-Foo"
+        // Get the second header named "X-Foo"
         $foo = $headers->get('X-Foo', 1);
 
-        //Get all headers that are present
+        // Get all headers that are present
         $all = $headers->getAll();
 
 Check if a Header Exists
@@ -647,8 +638,7 @@ To check if a header exists:
 * Call the HeaderSet's ``has()`` method specifying the header you're looking
   for.
 
-If the header exists, ``true`` will be returned or
-``false`` if not.
+If the header exists, ``true`` will be returned or ``false`` if not.
 
 .. note::
 
@@ -661,12 +651,12 @@ If the header exists, ``true`` will be returned or
 
         $headers = $message->getHeaders();
 
-        //Check if the To: header exists
+        // Check if the To: header exists
         if ($headers->has('To')) {
           echo 'To: exists';
         }
 
-        //Check if an X-Foo header exists twice (i.e. check for the 2nd one)
+        // Check if an X-Foo header exists twice (i.e. check for the 2nd one)
         if ($headers->has('X-Foo', 1)) {
           echo 'Second X-Foo header exists';
         }
@@ -684,9 +674,9 @@ To remove an existing header:
 * Call the HeaderSet's ``remove()`` or ``removeAll()`` methods specifying the
   header you want to remove.
 
-When calling ``remove()`` a single header will be removed. When
-calling ``removeAll()`` all headers with the given name will be
-removed. If no headers exist with the given name, no errors will occur.
+When calling ``remove()`` a single header will be removed. When calling
+``removeAll()`` all headers with the given name will be removed. If no headers
+exist with the given name, no errors will occur.
 
 .. note::
 
@@ -700,22 +690,22 @@ removed. If no headers exist with the given name, no errors will occur.
 
         $headers = $message->getHeaders();
 
-        //Remove the Subject: header
+        // Remove the Subject: header
         $headers->remove('Subject');
 
-        //Remove all X-Foo headers
+        // Remove all X-Foo headers
         $headers->removeAll('X-Foo');
 
-        //Remove only the second X-Foo header
+        // Remove only the second X-Foo header
         $headers->remove('X-Foo', 1);
 
 Modifying a Header's Content
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-To change a Header's content you should know what type of header it is and
-then call it's appropriate setter method. All headers also have a
-``setFieldBodyModel()`` method that accepts a mixed parameter and
-delegates to the correct setter.
+To change a Header's content you should know what type of header it is and then
+call it's appropriate setter method. All headers also have a
+``setFieldBodyModel()`` method that accepts a mixed parameter and delegates to
+the correct setter.
 
 To modify an existing header:
 
@@ -733,18 +723,18 @@ when the message is sent.
 
     $headers = $message->getHeaders();
 
-    //Change the Subject: header
+    // Change the Subject: header
     $subj = $headers->get('Subject');
     $subj->setValue('new subject here');
 
-    //Change the To: header
+    // Change the To: header
     $to = $headers->get('To');
     $to->setNameAddresses(array(
       'person@example.org' => 'Person',
       'thing@example.org'
     ));
 
-    //Using the setFieldBodyModel() just delegates to the correct method
+    // Using the setFieldBodyModel() just delegates to the correct method
     // So here to calls setNameAddresses()
     $to->setFieldBodyModel(array(
       'person@example.org' => 'Person',

vendor/swiftmailer/doc/including-the-files.rst

@@ -1,7 +1,7 @@
 Including Swift Mailer (Autoloading)
 ====================================
 
-Swift Mailer uses an auto-loader so the only file you need to include is the
+Swift Mailer uses an autoloader so the only file you need to include is the
 ``lib/swift_required.php`` file.
 
 To use Swift Mailer's autoloader:

vendor/swiftmailer/doc/installing.rst

@@ -7,10 +7,10 @@ extracted source files to your web server.
 Installing from PEAR
 --------------------
 
-If you want to install Swiftmailer globally on your machine, the easiest
+If you want to install Swift Mailer globally on your machine, the easiest
 installation method is using the PEAR channel.
 
-To install the Swiftmailer PEAR package:
+To install the Swift Mailer PEAR package:
 
 * Run the command ``pear channel-discover pear.swiftmailer.org``.
 
@@ -48,9 +48,9 @@ the ``tar`` command.
 
 .. code-block:: bash
 
-    chrisbook:build chris$ ls
+    $ ls
     Swift-4.0.0-dev.tar.gz
-    chrisbook:build chris$ tar xvzf Swift-4.0.0-dev.tar.gz 
+    $ tar xvzf Swift-4.0.0-dev.tar.gz 
     Swift-4.0.0-dev/
     Swift-4.0.0-dev/lib/
     Swift-4.0.0-dev/lib/classes/
@@ -66,10 +66,10 @@ the ``tar`` command.
     Swift-4.0.0-dev/tests/unit/Swift/Transport/LoadBalancedTransportTest.php
     Swift-4.0.0-dev/tests/unit/Swift/Transport/SendmailTransportTest.php
     Swift-4.0.0-dev/tests/unit/Swift/Transport/StreamBufferTest.php
-    chrisbook:build chris$ cd Swift-4.0.0-dev
-    chrisbook:Swift-4.0.0-dev chris$ ls
+    $ cd Swift-4.0.0-dev
+    $ ls
     CHANGES		LICENSE.GPL	LICENSE.LGPL	README		VERSION		examples	lib		test-suite	tests
-    chrisbook:Swift-4.0.0-dev chris$
+    $
 
 Installing from Git
 -------------------
@@ -111,8 +111,8 @@ OS X.
 
 .. code-block:: bash
 
-    chrisbook:~ chris$ cd source_code/
-    chrisbook:source_code chris$ git clone git://github.com/swiftmailer/swiftmailer.git swiftmailer
+    $ cd source_code/
+    $ git clone git://github.com/swiftmailer/swiftmailer.git swiftmailer
     Initialized empty Git repository in /Users/chris/source_code/swiftmailer/.git/
     remote: Counting objects: 6815, done.
     remote: Compressing objects: 100% (2761/2761), done.
@@ -120,11 +120,11 @@ OS X.
     Receiving objects: 100% (6815/6815), 4.35 MiB | 162 KiB/s, done.
     Resolving deltas: 100% (3641/3641), done.
     Checking out files: 100% (1847/1847), done.
-    chrisbook:source_code chris$ cd swiftmailer/
-    chrisbook:swiftmailer chris$ ls
+    $ cd swiftmailer/
+    $ ls
     CHANGES		LICENSE.LGPL	README.git	VERSION		docs		lib		test-suite	util
     LICENSE.GPL	README		TODO		build.xml	examples	notes		tests
-    chrisbook:swiftmailer chris$
+    $
 
 Uploading to your Host
 ----------------------
@@ -133,8 +133,8 @@ You only need to upload the "lib/" directory to your web host for production
 use. All other files and directories are support files not needed in
 production.
 
-You will need FTP, rsync or similar software installed in order to upload the
-"lib/" directory to your web host.
+You will need FTP, ``rsync`` or similar software installed in order to upload 
+the "lib/" directory to your web host.
 
 To upload Swift Mailer:
 
@@ -150,12 +150,12 @@ The following example shows show you can upload the files using
 
 .. note::
 
-    You do not need to place the files inside your web root. They only need to be in a place
-    where your PHP scripts can "include" them.
+    You do not need to place the files inside your web root. They only need to 
+    be in a place where your PHP scripts can "include" them.
 
     .. code-block:: bash
 
-        chrisbook:Swift-4.0.0-dev chris$ rsync -rvz lib d11wtq@swiftmailer.org:swiftmailer
+        $ rsync -rvz lib d11wtq@swiftmailer.org:swiftmailer
         building file list ... done
         created directory swiftmailer
         lib/
@@ -174,14 +174,14 @@ The following example shows show you can upload the files using
 
         sent 151692 bytes  received 2974 bytes  5836.45 bytes/sec
         total size is 401405  speedup is 2.60
-        chrisbook:Swift-4.0.0-dev chris$
+        $
 
 .. _`github`: http://github.com/swiftmailer/swiftmailer
 
 Troubleshooting
 ---------------
 
-Swiftmailer does not work when used with function overloading as implemented
+Swift Mailer does not work when used with function overloading as implemented
 by ``mbstring`` (``mbstring.func_overload`` set to ``2``). A workaround is to
 temporarily change the internal encoding to ``ASCII`` when sending an email:
 
@@ -193,7 +193,7 @@ temporarily change the internal encoding to ``ASCII`` when sending an email:
       mb_internal_encoding('ASCII');
     }
 
-    // Creation your message and send it with Swiftmailer
+    // Create your message and send it with Swift Mailer
 
     if (isset($mbEncoding))
     {

vendor/swiftmailer/doc/messages.rst

@@ -30,25 +30,25 @@ To create a Message:
 
     require_once 'lib/swift_required.php';
 
-    //Create the message
+    // Create the message
     $message = Swift_Message::newInstance()
 
-      //Give the message a subject
+      // Give the message a subject
       ->setSubject('Your subject')
 
-      //Set the From address with an associative array
+      // Set the From address with an associative array
       ->setFrom(array('john@doe.com' => 'John Doe'))
 
-      //Set the To addresses with an associative array
+      // Set the To addresses with an associative array
       ->setTo(array('receiver@domain.org', 'other@domain.org' => 'A name'))
 
-      //Give it a body
+      // Give it a body
       ->setBody('Here is the message itself')
 
-      //And optionally an alternative body
+      // And optionally an alternative body
       ->addPart('<q>Here is the message itself</q>', 'text/html')
 
-      //Optionally add any attachments
+      // Optionally add any attachments
       ->attach(Swift_Attachment::fromPath('my-document.pdf'))
       ;
 
@@ -170,13 +170,14 @@ Adding Content to Your Message
 ------------------------------
 
 Rich content can be added to messages in Swift Mailer with relative ease by
-calling methods such as setSubject(), setBody(), addPart() and attach().
+calling methods such as ``setSubject()``, ``setBody()``, ``addPart()`` and
+``attach()``.
 
 Setting the Subject Line
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
 The subject line, displayed in the recipients' mail client can be set with the
-setSubject() method, or as a parameter to Swift_Message::newInstance().
+``setSubject()`` method, or as a parameter to ``Swift_Message::newInstance()``.
 
 To set the subject of your Message:
 
@@ -195,8 +196,8 @@ Setting the Body Content
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
 The body of the message -- seen when the user opens the message --
-is specified by calling the setBody() method. If an alternative body is to be
-included addPart() can be used.
+is specified by calling the ``setBody()`` method. If an alternative body is to
+be included ``addPart()`` can be used.
 
 The body of a message is the main part that is read by the user. Often people
 want to send a message in HTML format (``text/html``), other
@@ -215,27 +216,27 @@ To set the body of your Message:
 
 * Add any alternative bodies with ``addPart()``.
 
-If the recipient's mail client offers preferences for displaying text vs. HTML then
-the mail client will present that part to the user where available.  In other cases
-the mail client will display the "best" part it can - usually HTML if you've included
-HTML.
+If the recipient's mail client offers preferences for displaying text vs. HTML
+then the mail client will present that part to the user where available.  In
+other cases the mail client will display the "best" part it can - usually HTML
+if you've included HTML.
 
 .. code-block:: php
 
-    //Pass it as a parameter when you create the message
+    // Pass it as a parameter when you create the message
     $message = Swift_Message::newInstance('Subject here', 'My amazing body');  
 
-    //Or set it after like this
+    // Or set it after like this
     $message->setBody('My <em>amazing</em> body', 'text/html');
 
-    //Add alternative parts with addPart()
+    // Add alternative parts with addPart()
     $message->addPart('My amazing body in plain text', 'text/plain');
 
 Attaching Files
 ---------------
 
 Attachments are downloadable parts of a message and can be added by calling
-the attach() method on the message. You can add attachments that exist on
+the ``attach()`` method on the message. You can add attachments that exist on
 disk, or you can create attachments on-the-fly.
 
 Attachments are actually an interesting area of Swift Mailer and something
@@ -258,7 +259,7 @@ Attaching Existing Files
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
 Files that already exist, either on disk or at a URL can be attached to a
-message with just one line of code, using Swift_Attachment::fromPath().
+message with just one line of code, using ``Swift_Attachment::fromPath()``.
 
 You can attach files that exist locally, or if your PHP installation has
 ``allow_url_fopen`` turned on you can attach files from other
@@ -275,19 +276,19 @@ the same filename as the one you attached.
 
 .. code-block:: php
 
-    //Create the attachment
+    // Create the attachment
     // * Note that you can technically leave the content-type parameter out
     $attachment = Swift_Attachment::fromPath('/path/to/image.jpg', 'image/jpeg');  
 
-    //Attach it to the message
+    // Attach it to the message
     $message->attach($attachment);
 
 
-    //The two statements above could be written in one line instead
+    // The two statements above could be written in one line instead
     $message->attach(Swift_Attachment::fromPath('/path/to/image.jpg'));
 
 
-    //You can attach files from a URL if allow_url_fopen is on in php.ini
+    // You can attach files from a URL if allow_url_fopen is on in php.ini
     $message->attach(Swift_Attachment::fromPath('http://site.tld/logo.png'));
 
 Setting the Filename
@@ -295,7 +296,7 @@ Setting the Filename
 
 Usually you don't need to explicitly set the filename of an attachment because
 the name of the attached file will be used by default, but if you want to set
-the filename you use the setFilename() method of the Attachment.
+the filename you use the ``setFilename()`` method of the Attachment.
 
 To change the filename of an attachment:
 
@@ -306,12 +307,12 @@ the email will rename the file to something else.
 
 .. code-block:: php
 
-    //Create the attachment and call its setFilename() method
+    // Create the attachment and call its setFilename() method
     $attachment = Swift_Attachment::fromPath('/path/to/image.jpg')
       ->setFilename('cool.jpg');
 
 
-    //Because there's a fluid interface, you can do this in one statement
+    // Because there's a fluid interface, you can do this in one statement
     $message->attach(
       Swift_Attachment::fromPath('/path/to/image.jpg')->setFilename('cool.jpg')
     );
@@ -321,7 +322,7 @@ Attaching Dynamic Content
 
 Files that are generated at runtime, such as PDF documents or images created
 via GD can be attached directly to a message without writing them out to disk.
-Use the standard Swift_Attachment::newInstance() method.
+Use the standard ``Swift_Attachment::newInstance()`` method.
 
 To attach dynamically created content:
 
@@ -342,17 +343,17 @@ with the filename and content-type you specify.
 
     .. code-block:: php
 
-        //Create your file contents in the normal way, but don't write them to disk
+        // Create your file contents in the normal way, but don't write them to disk
         $data = create_my_pdf_data();
 
-        //Create the attachment with your data
-        $attachment = Swift_Attachment::newInstance($data, 'my-file.pdf', 'application/pdf');  
+        // Create the attachment with your data
+        $attachment = Swift_Attachment::newInstance($data, 'my-file.pdf', 'application/pdf');
 
-        //Attach it to the message
+        // Attach it to the message
         $message->attach($attachment);
 
 
-        //You can alternatively use method chaining to build the attachment
+        // You can alternatively use method chaining to build the attachment
         $attachment = Swift_Attachment::newInstance()
           ->setFilename('my-file.pdf')
           ->setContentType('application/pdf')
@@ -364,7 +365,7 @@ Changing the Disposition
 
 Attachments just appear as files that can be saved to the Desktop if desired.
 You can make attachment appear inline where possible by using the
-setDisposition() method of an attachment.
+``setDisposition()`` method of an attachment.
 
 To make an attachment appear inline:
 
@@ -381,12 +382,12 @@ client knows how to display it.
 
     .. code-block:: php
 
-        //Create the attachment and call its setDisposition() method
+        // Create the attachment and call its setDisposition() method
         $attachment = Swift_Attachment::fromPath('/path/to/image.jpg')
           ->setDisposition('inline');
 
 
-        //Because there's a fluid interface, you can do this in one statement
+        // Because there's a fluid interface, you can do this in one statement
         $message->attach(
           Swift_Attachment::fromPath('/path/to/image.jpg')->setDisposition('inline')
         );
@@ -424,11 +425,10 @@ Embedding Existing Files
 ........................
 
 Files that already exist, either on disk or at a URL can be embedded in a
-message with just one line of code, using Swift_EmbeddedFile::fromPath().
+message with just one line of code, using ``Swift_EmbeddedFile::fromPath()``.
 
 You can embed files that exist locally, or if your PHP installation has
-``allow_url_fopen`` turned on you can embed files from other
-websites.
+``allow_url_fopen`` turned on you can embed files from other websites.
 
 To embed an existing file:
 
@@ -451,24 +451,24 @@ is used as a ``src`` attribute.
 
     .. code-block:: php
 
-        //Create the message
+        // Create the message
         $message = Swift_Message::newInstance('My subject');
 
-        //Set the body
+        // Set the body
         $message->setBody(
         '<html>' .
         ' <head></head>' .
         ' <body>' .
-        '  Here is an image <img src="' . //Embed the file
+        '  Here is an image <img src="' . // Embed the file
              $message->embed(Swift_Image::fromPath('image.png')) .
            '" alt="Image" />' .
         '  Rest of message' .
         ' </body>' .
         '</html>',
-          'text/html' //Mark the content-type as HTML
+          'text/html' // Mark the content-type as HTML
         );
 
-        //You can embed files from a URL if allow_url_fopen is on in php.ini
+        // You can embed files from a URL if allow_url_fopen is on in php.ini
         $message->setBody(
         '<html>' .
         ' <head></head>' .
@@ -495,7 +495,7 @@ is used as a ``src`` attribute.
         '  Rest of message' .
         ' </body>' .
         '</html>',
-          'text/html' //Mark the content-type as HTML
+          'text/html' // Mark the content-type as HTML
         );
 
 Embedding Dynamic Content
@@ -503,7 +503,7 @@ Embedding Dynamic Content
 
 Images that are generated at runtime, such as images created via GD can be
 embedded directly to a message without writing them out to disk. Use the
-standard Swift_Image::newInstance() method.
+standard ``Swift_Image::newInstance()`` method.
 
 To embed dynamically created content:
 
@@ -527,7 +527,7 @@ is used as a ``src`` attribute.
 
     .. code-block:: php
 
-        //Create your file contents in the normal way, but don't write them to disk
+        // Create your file contents in the normal way, but don't write them to disk
         $img_data = create_my_image_data();
 
         //Create the message
@@ -538,13 +538,13 @@ is used as a ``src`` attribute.
         '<html>' .
         ' <head></head>' .
         ' <body>' .
-        '  Here is an image <img src="' . //Embed the file
+        '  Here is an image <img src="' . // Embed the file
              $message->embed(Swift_Image::newInstance($img_data, 'image.jpg', 'image/jpeg')) .
            '" alt="Image" />' .
         '  Rest of message' .
         ' </body>' .
         '</html>',
-          'text/html' //Mark the content-type as HTML
+          'text/html' // Mark the content-type as HTML
         );
 
 
@@ -560,15 +560,15 @@ is used as a ``src`` attribute.
         '  Rest of message' .
         ' </body>' .
         '</html>',
-          'text/html' //Mark the content-type as HTML
+          'text/html' // Mark the content-type as HTML
         );
 
 Adding Recipients to Your Message
 ---------------------------------
 
-Recipients are specified within the message itself via setTo(), setCc() and
-setBcc(). Swift Mailer reads these recipients from the message when it gets
-sent so that it knows where to send the message to.
+Recipients are specified within the message itself via ``setTo()``, ``setCc()``
+and ``setBcc()``. Swift Mailer reads these recipients from the message when it
+gets sent so that it knows where to send the message to.
 
 Message recipients are one of three types:
 
@@ -584,8 +584,8 @@ providing the real name of the recipient.
 
 .. sidebar:: Syntax for Addresses
 
-    If you only wish to refer to a single email address (for example your ``From:``
-    address) then you can just use a string.
+    If you only wish to refer to a single email address (for example your
+    ``From:`` address) then you can just use a string.
 
     .. code-block:: php
 
@@ -604,14 +604,14 @@ providing the real name of the recipient.
          $message->setTo(array('some@address.tld', 'other@address.tld'));
 
     You can mix personalized (addresses with a name) and non-personalized
-    addresses in the same list by mixing the use of associative and non-associative
-    array syntax.
+    addresses in the same list by mixing the use of associative and
+    non-associative array syntax.
 
     .. code-block:: php
 
          $message->setTo(array(
            'recipient-with-name@example.org' => 'Recipient Name One',
-           'no-name@example.org', //Note that this is not a key-value pair
+           'no-name@example.org', // Note that this is not a key-value pair
            'named-recipient@example.org' => 'Recipient Name Two'
          ));
 
@@ -622,9 +622,8 @@ Setting ``To:`` Recipients
 ``setTo()`` or ``addTo()`` methods of the message.
 
 To set ``To:`` recipients, create the message object using either
-``new Swift_Message( ... )`` or
-``Swift_Message::newInstance( ... )``, then call the
-``setTo()`` method with a complete array of addresses, or use the
+``new Swift_Message( ... )`` or ``Swift_Message::newInstance( ... )``,
+then call the ``setTo()`` method with a complete array of addresses, or use the
 ``addTo()`` method to iteratively add recipients.
 
 The ``setTo()`` method accepts input in various formats as described earlier in
@@ -643,7 +642,7 @@ seen by the other recipients.
 
     .. code-block:: php
 
-        //Using setTo() to set all recipients in one go
+        // Using setTo() to set all recipients in one go
         $message->setTo(array(
           'person1@example.org',
           'person2@otherdomain.org' => 'Person 2 Name',
@@ -652,20 +651,19 @@ seen by the other recipients.
           'person5@example.org' => 'Person 5 Name'
         ));
 
-        //Using addTo() to add recipients iteratively
+        // Using addTo() to add recipients iteratively
         $message->addTo('person1@example.org');
         $message->addTo('person2@example.org', 'Person 2 Name');
 
 Setting ``Cc:`` Recipients
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-``Cc:`` recipients are set with the
-``setCc()`` or ``addCc()`` methods of the message.
+``Cc:`` recipients are set with the ``setCc()`` or ``addCc()`` methods of the 
+message.
 
 To set ``Cc:`` recipients, create the message object using either
-``new Swift_Message( ... )`` or
-``Swift_Message::newInstance( ... )``, then call the
-``setCc()`` method with a complete array of addresses, or use the
+``new Swift_Message( ... )`` or ``Swift_Message::newInstance( ... )``, then call 
+the ``setCc()`` method with a complete array of addresses, or use the
 ``addCc()`` method to iteratively add recipients.
 
 The ``setCc()`` method accepts input in various formats as described earlier in
@@ -684,7 +682,7 @@ seen by the other recipients.
 
     .. code-block:: php
 
-        //Using setCc() to set all recipients in one go
+        // Using setCc() to set all recipients in one go
         $message->setCc(array(
           'person1@example.org',
           'person2@otherdomain.org' => 'Person 2 Name',
@@ -693,20 +691,18 @@ seen by the other recipients.
           'person5@example.org' => 'Person 5 Name'
         ));
 
-        //Using addCc() to add recipients iteratively
+        // Using addCc() to add recipients iteratively
         $message->addCc('person1@example.org');
         $message->addCc('person2@example.org', 'Person 2 Name');
 
 Setting ``Bcc:`` Recipients
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-``Bcc:`` recipients receive a copy of the message without anybody
-else knowing it, and are set with the ``setBcc()`` or
-``addBcc`` methods of the message.
+``Bcc:`` recipients receive a copy of the message without anybody else knowing
+it, and are set with the ``setBcc()`` or ``addBcc()`` methods of the message.
 
-To set ``Bcc:`` recipients, create the message object using
-either ``new Swift_Message( ... )`` or
-``Swift_Message::newInstance( ... )``, then call the
+To set ``Bcc:`` recipients, create the message object using either ``new 
+Swift_Message( ... )`` or ``Swift_Message::newInstance( ... )``, then call the
 ``setBcc()`` method with a complete array of addresses, or use
 the ``addBcc()`` method to iteratively add recipients.
 
@@ -715,9 +711,9 @@ this chapter. The ``addBcc()`` method takes either one or two parameters. The
 first being the email address and the second optional parameter being the name
 of the recipient.
 
-Only the individual ``Bcc:`` recipient will see their address in
-the message headers. Other recipients (including other ``Bcc:``
-recipients) will not see the address.
+Only the individual ``Bcc:`` recipient will see their address in the message 
+headers. Other recipients (including other ``Bcc:`` recipients) will not see the 
+address.
 
 .. note::
 
@@ -727,7 +723,7 @@ recipients) will not see the address.
 
     .. code-block:: php
 
-        //Using setBcc() to set all recipients in one go
+        // Using setBcc() to set all recipients in one go
         $message->setBcc(array(
           'person1@example.org',
           'person2@otherdomain.org' => 'Person 2 Name',
@@ -736,7 +732,7 @@ recipients) will not see the address.
           'person5@example.org' => 'Person 5 Name'
         ));
 
-        //Using addBcc() to add recipients iteratively
+        // Using addBcc() to add recipients iteratively
         $message->addBcc('person1@example.org');
         $message->addBcc('person2@example.org', 'Person 2 Name');
 
@@ -755,27 +751,24 @@ The sender information is contained in three possible places:
 
 * ``Return-Path:`` -- the address where bounces should go to (optional)
 
-You must always include a ``From:`` address by using
-``setFrom()`` on the message. Swift Mailer will use this as the
-default ``Return-Path:`` unless otherwise specified.
+You must always include a ``From:`` address by using ``setFrom()`` on the 
+message. Swift Mailer will use this as the default ``Return-Path:`` unless 
+otherwise specified.
 
-The ``Sender:`` address exists because the person who actually
-sent the email may not be the person who wrote the email. It has a higher
-precedence than the ``From:`` address and will be used as the
-``Return-Path:`` unless otherwise specified.
+The ``Sender:`` address exists because the person who actually sent the email
+may not be the person who wrote the email. It has a higher precedence than the
+``From:`` address and will be used as the ``Return-Path:`` unless otherwise 
+specified.
 
 Setting the ``From:`` Address
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-A ``From:`` address is required and is set with the
-``setFrom()`` method of the message.
-
-``From:`` addresses specify who actually wrote the email, and
-usually who sent it.
+A ``From:`` address is required and is set with the ``setFrom()`` method of the
+message. ``From:`` addresses specify who actually wrote the email, and usually who sent it.
 
 What most people probably don't realise is that you can have more than one
-``From:`` address if more than one person wrote the email --
-for example if an email was put together by a committee.
+``From:`` address if more than one person wrote the email -- for example if an
+email was put together by a committee.
 
 To set the ``From:`` address(es):
 
@@ -791,13 +784,13 @@ will be seen by the recipients.
 
     .. code-block:: php
 
-        //Set a single From: address
+        // Set a single From: address
         $message->setFrom('your@address.tld');
 
-        //Set a From: address including a name
+        // Set a From: address including a name
         $message->setFrom(array('your@address.tld' => 'Your Name'));
 
-        //Set multiple From: addresses if multiple people wrote the email
+        // Set multiple From: addresses if multiple people wrote the email
         $message->setFrom(array(
           'person1@example.org' => 'Sender One',
           'person2@example.org' => 'Sender Two'
@@ -806,18 +799,17 @@ will be seen by the recipients.
 Setting the ``Sender:`` Address
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-A ``Sender:`` address specifies who sent the message and is set
-with the ``setSender()`` method of the message.
+A ``Sender:`` address specifies who sent the message and is set with the
+``setSender()`` method of the message.
 
 To set the ``Sender:`` address:
 
 * Call the ``setSender()`` method on the Message.
 
-The ``Sender:`` address is visible in the message headers and
-will be seen by the recipients.
+The ``Sender:`` address is visible in the message headers and will be seen by
+the recipients.
 
-This address will be used as the ``Return-Path:`` unless
-otherwise specified.
+This address will be used as the ``Return-Path:`` unless otherwise specified.
 
 .. note::
 
@@ -878,8 +870,8 @@ Setting the Character Set
 -------------------------
 
 The character set of the message (and it's MIME parts) is set with the
-setCharset() method. You can also change the global default of UTF-8 by
-working with the Swift_Preferences class.
+``setCharset()`` method. You can also change the global default of UTF-8 by
+working with the ``Swift_Preferences`` class.
 
 Swift Mailer will default to the UTF-8 character set unless otherwise
 overridden. UTF-8 will work in most instances since it includes all of the
@@ -891,7 +883,7 @@ completely garbled.
 
 There are two places in Swift Mailer where you can change the character set:
 
-* In the Swift_Preferences class
+* In the ``Swift_Preferences`` class
 
 * On each individual message and/or MIME part
 
@@ -904,25 +896,24 @@ To set the character set of your Message:
 
    .. code-block:: php
 
-    //Approach 1: Change the global setting (suggested)
+    // Approach 1: Change the global setting (suggested)
     Swift_Preferences::getInstance()->setCharset('iso-8859-2');
 
-    //Approach 2: Call the setCharset() method of the message
+    // Approach 2: Call the setCharset() method of the message
     $message = Swift_Message::newInstance()
       ->setCharset('iso-8859-2');
 
-    //Apprach 3: Specify the charset when setting the body
+    // Apprach 3: Specify the charset when setting the body
     $message->setBody('My body', 'text/html', 'iso-8859-2');
 
-    //Approach 4: Specify the charset for each part added
+    // Approach 4: Specify the charset for each part added
     $message->addPart('My part', 'text/plain', 'iso-8859-2');
 
 Setting the Line Length
 -----------------------
 
-The length of lines in a message can be changed by using the
-``setMaxLineLength()`` method on the message. It should be kept
-to less than 1000 characters.
+The length of lines in a message can be changed by using the ``setMaxLineLength()`` method on the message. It should be kept to less than
+1000 characters.
 
 Swift Mailer defaults to using 78 characters per line in a message. This is
 done for historical reasons and so that the message can be easily viewed in
@@ -949,15 +940,12 @@ words.
 Setting the Message Priority
 ----------------------------
 
-You can change the priority of the message with
-``setPriority()``. Setting the priority will not change the way
-your email is sent -- it is purely an indicative setting for the
-recipient.
+You can change the priority of the message with ``setPriority()``. Setting the
+priority will not change the way your email is sent -- it is purely an
+indicative setting for the recipient.
 
 The priority of a message is an indication to the recipient what significance
-it has. Swift Mailer allows you to set the priority by calling the
-``setPriority`` method. This method takes an integer value
-between 1 and 5:
+it has. Swift Mailer allows you to set the priority by calling the ``setPriority`` method. This method takes an integer value between 1 and 5:
 
 * Highest
 * High
@@ -972,5 +960,5 @@ To set the message priority:
 
 .. code-block:: php
 
-    //Indicate "High" priority
+    // Indicate "High" priority
     $message->setPriority(2);

vendor/swiftmailer/doc/plugins.rst

@@ -34,10 +34,9 @@ chance to process its queue and recover some resources.
 Using the AntiFlood Plugin
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The AntiFlood Plugin -- like all plugins -- is added with the Mailer
-class' ``registerPlugin()`` method. It takes two constructor
-parameters: the number of emails to pause after, and optionally the number of
-seconds to pause for.
+The AntiFlood Plugin -- like all plugins -- is added with the Mailer class'
+``registerPlugin()`` method. It takes two constructor parameters: the number of
+emails to pause after, and optionally the number of seconds to pause for.
 
 To use the AntiFlood plugin:
 
@@ -59,18 +58,18 @@ specified amount of time.
 
     require_once 'lib/swift_required.php';
 
-    //Create the Mailer using any Transport
+    // Create the Mailer using any Transport
     $mailer = Swift_Mailer::newInstance(
       Swift_SmtpTransport::newInstance('smtp.example.org', 25)
     );
 
-    //Use AntiFlood to re-connect after 100 emails
+    // Use AntiFlood to re-connect after 100 emails
     $mailer->registerPlugin(new Swift_Plugins_AntiFloodPlugin(100));
 
-    //Or specify a time in seconds to pause for (30 secs)
+    // And specify a time in seconds to pause for (30 secs)
     $mailer->registerPlugin(new Swift_Plugins_AntiFloodPlugin(100, 30));
 
-    //Continue sending as normal
+    // Continue sending as normal
     for ($lotsOfRecipients as $recipient) {
       ...
 
@@ -96,9 +95,9 @@ bytes-transferred per-minute.
 Using the Throttler Plugin
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The Throttler Plugin -- like all plugins -- is added with the Mailer
-class' ``registerPlugin()`` method. It has two required
-constructor parameters that tell it how to do its rate-limiting.
+The Throttler Plugin -- like all plugins -- is added with the Mailer class'
+``registerPlugin()`` method. It has two required constructor parameters that
+tell it how to do its rate-limiting.
 
 To use the Throttler plugin:
 
@@ -112,31 +111,30 @@ To use the Throttler plugin:
 
 * Continue using Swift Mailer to send messages as normal.
 
-When Swift Mailer sends messages it will keep track of the rate at which
-sending messages is occuring. If it realises that sending is happening too
-fast, it will cause your program to ``sleep()`` for enough time
-to average out the rate.
+When Swift Mailer sends messages it will keep track of the rate at which sending
+messages is occurring. If it realises that sending is happening too fast, it
+will cause your program to ``sleep()`` for enough time to average out the rate.
 
 .. code-block:: php
 
     require_once 'lib/swift_required.php';
 
-    //Create the Mailer using any Transport
+    // Create the Mailer using any Transport
     $mailer = Swift_Mailer::newInstance(
       Swift_SmtpTransport::newInstance('smtp.example.org', 25)
     );
 
-    //Rate limit to 100 emails per-minute
+    // Rate limit to 100 emails per-minute
     $mailer->registerPlugin(new Swift_Plugins_ThrottlerPlugin(
       100, Swift_Plugins_ThrottlerPlugin::MESSAGES_PER_MINUTE
     ));
 
-    //Rate limit to 10MB per-minute
+    // Rate limit to 10MB per-minute
     $mailer->registerPlugin(new Swift_Plugins_ThrottlerPlugin(
       1024 * 1024 * 10, Swift_Plugins_ThrottlerPlugin::BYTES_PER_MINUTE
     ));
 
-    //Continue sending as normal
+    // Continue sending as normal
     for ($lotsOfRecipients as $recipient) {
       ...
 
@@ -175,9 +173,9 @@ class that implements the ``Swift_Plugins_Logger`` interface.
 Using the Logger Plugin
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-The Logger Plugin -- like all plugins -- is added with the Mailer
-class' ``registerPlugin()`` method. It accepts an instance of
-``Swift_Plugins_Logger`` in its constructor.
+The Logger Plugin -- like all plugins -- is added with the Mailer class'
+``registerPlugin()`` method. It accepts an instance of ``Swift_Plugins_Logger``
+in its constructor.
 
 To use the Logger plugin:
 
@@ -204,20 +202,20 @@ get the contents of the log.
 
     require_once 'lib/swift_required.php';
 
-    //Create the Mailer using any Transport
+    // Create the Mailer using any Transport
     $mailer = Swift_Mailer::newInstance(
      Swift_SmtpTransport::newInstance('smtp.example.org', 25)
     );
 
-    //To use the ArrayLogger
+    // To use the ArrayLogger
     $logger = new Swift_Plugins_Loggers_ArrayLogger();
     $mailer->registerPlugin(new Swift_Plugins_LoggerPlugin($logger));
 
-    //Or to use the Echo Logger
+    // Or to use the Echo Logger
     $logger = new Swift_Plugins_Loggers_EchoLogger();
     $mailer->registerPlugin(new Swift_Plugins_LoggerPlugin($logger));
 
-    //Continue sending as normal
+    // Continue sending as normal
     for ($lotsOfRecipients as $recipient) {
      ...
 
@@ -252,9 +250,9 @@ find the required replacements during sending.
 Using the Decorator Plugin
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-To use the Decorator plugin, simply create an associative array of
-replacements based on email addresses and then use the mailer's
-``registerPlugin()`` method to add the plugin.
+To use the Decorator plugin, simply create an associative array of replacements
+based on email addresses and then use the mailer's ``registerPlugin()`` method
+to add the plugin.
 
 First create an associative array of replacements based on the email addresses
 you'll be sending the message to.
@@ -277,8 +275,8 @@ you'll be sending the message to.
           );
         }
 
-Now create an instance of the Decorator plugin using this array of
-replacements and then register it with the Mailer. Do this only once!
+Now create an instance of the Decorator plugin using this array of replacements 
+and then register it with the Mailer. Do this only once!
 
 .. code-block:: php
 
@@ -304,9 +302,9 @@ line) with your placeholders.
     }
 
 When you send this message to each of your recipients listed in your
-``$replacements`` array they will receive a message customized
-for just themselves. For example, the message used above when received may
-appear like this to one user:
+``$replacements`` array they will receive a message customized for just 
+themselves. For example, the message used above when received may appear like 
+this to one user:
 
 .. code-block:: text
 
@@ -339,9 +337,8 @@ that performs replacement lookups on-the-fly you may provide your own
 implementation.
 
 Providing your own replacements lookup implementation for the Decorator is
-simply a matter of passing an instance of
-``Swift_Plugins_Decorator_Replacements`` to the decorator
-plugin's constructor, rather than passing in an array.
+simply a matter of passing an instance of ``Swift_Plugins_Decorator_Replacements`` to the decorator plugin's constructor,
+rather than passing in an array.
 
 The Replacements interface is very simple to implement since it has just one
 method: ``getReplacementsFor($address)``.
@@ -378,9 +375,8 @@ plugin's constructor instead of passing an array.
 
     $mailer->registerPlugin($decorator);
 
-For each message sent, the plugin will call your class'
-``getReplacementsFor()`` method to find the array of replacements
-it needs.
+For each message sent, the plugin will call your class' ``getReplacementsFor()``
+method to find the array of replacements it needs.
 
 .. note::
 

vendor/swiftmailer/doc/sending.rst

@@ -10,8 +10,8 @@ create the Mailer, then you use the Mailer to send the message.
 To send a Message:
 
 * Create a Transport from one of the provided Transports --
-  ``Swift_SmtpTransport``, ``Swift_SendmailTransport``,
-  ``Swift_MailTransport`` or one of the aggregate Transports.
+  ``Swift_SmtpTransport``, ``Swift_SendmailTransport``, ``Swift_MailTransport`` 
+  or one of the aggregate Transports.
 
 * Create an instance of the ``Swift_Mailer`` class, using the Transport as
   it's constructor parameter.
@@ -28,19 +28,18 @@ To send a Message:
     following PHP script: ``<?php echo function_exists('proc_open') ? "Yep,
     that will work" : "Sorry, that won't work"; ``
 
-When using ``send()`` the message will be sent just like it would
-be sent if you used your mail client. An integer is returned which includes
-the number of successful recipients. If none of the recipients could be sent
-to then zero will be returned, which equates to a boolean
-``false``. If you set two ``To:`` recipients and
-three ``Bcc:`` recipients in the message and all of the
+When using ``send()`` the message will be sent just like it would be sent if you
+used your mail client. An integer is returned which includes the number of
+successful recipients. If none of the recipients could be sent to then zero will
+be returned, which equates to a boolean ``false``. If you set two ``To:``
+recipients and three ``Bcc:`` recipients in the message and all of the
 recipients are delivered to successfully then the value 5 will be returned.
 
 .. code-block:: php
 
     require_once 'lib/swift_required.php';
 
-    //Create the Transport
+    // Create the Transport
     $transport = Swift_SmtpTransport::newInstance('smtp.example.org', 25)
       ->setUsername('your username')
       ->setPassword('your password')
@@ -49,24 +48,24 @@ recipients are delivered to successfully then the value 5 will be returned.
     /*
     You could alternatively use a different transport such as Sendmail or Mail:
 
-    //Sendmail
+    // Sendmail
     $transport = Swift_SendmailTransport::newInstance('/usr/sbin/sendmail -bs');
 
-    //Mail
+    // Mail
     $transport = Swift_MailTransport::newInstance();
     */
 
-    //Create the Mailer using your created Transport
+    // Create the Mailer using your created Transport
     $mailer = Swift_Mailer::newInstance($transport);
 
-    //Create a message
+    // Create a message
     $message = Swift_Message::newInstance('Wonderful Subject')
       ->setFrom(array('john@doe.com' => 'John Doe'))
       ->setTo(array('receiver@domain.org', 'other@domain.org' => 'A name'))
       ->setBody('Here is the message itself')
       ;
   
-    //Send the message
+    // Send the message
     $result = $mailer->send($message);
 
 Transport Types
@@ -83,8 +82,8 @@ use for your environment.
 The SMTP Transport
 ..................
 
-The SMTP Transport sends messages over the (standardized) Simple Message Transfer
-Protocol.  It can deal with encryption and authentication.
+The SMTP Transport sends messages over the (standardized) Simple Message
+Transfer Protocol.  It can deal with encryption and authentication.
 
 The SMTP Transport, ``Swift_SmtpTransport`` is without doubt the most commonly
 used Transport because it will work on 99% of web servers (I just made that
@@ -109,10 +108,8 @@ easily store the SMTP server address and port number in a configuration file
 within your application and adjust the settings accordingly if the code is
 moved or if the SMTP server is changed.
 
-Some SMTP servers -- Google for example -- use encryption for
-security reasons. Swift Mailer supports using both SSL and TLS encryption
-settings.
-
+Some SMTP servers -- Google for example -- use encryption for security reasons. 
+Swift Mailer supports using both SSL and TLS encryption settings.
 
 Using the SMTP Transport
 ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -139,10 +136,10 @@ A connection to the SMTP server will be established upon the first call to
 
     require_once 'lib/swift_required.php';
 
-    //Create the Transport
+    // Create the Transport
     $transport = Swift_SmtpTransport::newInstance('smtp.example.org', 25);
 
-    //Create the Mailer using your created Transport
+    // Create the Mailer using your created Transport
     $mailer = Swift_Mailer::newInstance($transport);
 
     /*
@@ -173,7 +170,7 @@ settings.
 
 .. note::
 
-    For SSL or TLS encryption to work your PHP installation must have
+    For SSL or TLS encryption to work your PHP installation must have 
     appropriate OpenSSL transports wrappers. You can check if "tls" and/or
     "ssl" are present in your PHP installation by using the PHP function
     ``stream_get_transports()``
@@ -182,10 +179,10 @@ settings.
 
         require_once 'lib/swift_required.php';
 
-        //Create the Transport
+        // Create the Transport
         $transport = Swift_SmtpTransport::newInstance('smtp.example.org', 587, 'ssl');
 
-        //Create the Mailer using your created Transport
+        // Create the Mailer using your created Transport
         $mailer = Swift_Mailer::newInstance($transport);
 
         /*
@@ -202,7 +199,7 @@ SMTP with a Username and Password
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Some servers require authentication. You can provide a username and password
-with ``setUsername()`` and ``setPassword()``.
+with ``setUsername()`` and ``setPassword()`` methods.
 
 To use a username and password with the SMTP Transport:
 
@@ -213,8 +210,8 @@ To use a username and password with the SMTP Transport:
 Your username and password will be used to authenticate upon first connect
 when ``send()`` are first used on the Mailer.
 
-If authentication fails, an Exception of type
-``Swift_TransportException`` will be thrown.
+If authentication fails, an Exception of type ``Swift_TransportException`` will 
+be thrown.
 
 .. note::
 
@@ -226,13 +223,13 @@ If authentication fails, an Exception of type
 
         require_once 'lib/swift_required.php';
 
-        //Create the Transport the call setUsername() and setPassword()
+        // Create the Transport the call setUsername() and setPassword()
         $transport = Swift_SmtpTransport::newInstance('smtp.example.org', 25)
           ->setUsername('username')
           ->setPassword('password')
           ;
 
-        //Create the Mailer using your created Transport
+        // Create the Mailer using your created Transport
         $mailer = Swift_Mailer::newInstance($transport);
 
 The Sendmail Transport
@@ -241,18 +238,17 @@ The Sendmail Transport
 The Sendmail Transport sends messages by communicating with a locally
 installed MTA -- such as ``sendmail``.
 
-The Sendmail Transport, ``Swift_SendmailTransport`` does not
-directly connect to any remote services. It is designed for Linux servers that
-have ``sendmail`` installed. The Transport starts a local
-``sendmail`` process and sends messages to it. Usually the
-``sendmail`` process will respond quickly as it spools your
+The Sendmail Transport, ``Swift_SendmailTransport`` does not directly connect to
+any remote services. It is designed for Linux servers that have ``sendmail``
+installed. The Transport starts a local ``sendmail`` process and sends messages
+to it. Usually the ``sendmail`` process will respond quickly as it spools your
 messages to disk before sending them.
 
 The Transport is named the Sendmail Transport for historical reasons
-(``sendmail`` was the "standard" UNIX tool for sending e-mail
-for years). It will send messages using other transfer agents such as Exim or
-Postfix despite its name, provided they have the relevant sendmail wrappers so
-that they can be started with the correct command-line flags.
+(``sendmail`` was the "standard" UNIX tool for sending e-mail for years). It
+will send messages using other transfer agents such as Exim or Postfix despite
+its name, provided they have the relevant sendmail wrappers so that they can be
+started with the correct command-line flags.
 
 It's a common misconception that because the Sendmail Transport returns a
 result very quickly it must therefore deliver messages to recipients quickly
@@ -263,10 +259,10 @@ been quickly spooled to disk.
 
 The Sendmail Transport has the potential to be just as smart of the SMTP
 Transport when it comes to notifying Swift Mailer about which recipients were
-rejected, but in reality the majority of locally installed
-``sendmail`` instances are not configured well enough to
-provide any useful feedback. As such Swift Mailer may report successful
-deliveries where they did in fact fail before they even left your server.
+rejected, but in reality the majority of locally installed ``sendmail``
+instances are not configured well enough to provide any useful feedback. As such
+Swift Mailer may report successful deliveries where they did in fact fail before
+they even left your server.
 
 You can run the Sendmail Transport in two different modes specified by command
 line flags:
@@ -277,33 +273,29 @@ line flags:
 * "``-t``" runs in piped mode with no feedback, but theoretically faster,
   though not advised
 
-You can think of the Sendmail Transport as a sort of asynchronous SMTP
-Transport -- though if you have problems with delivery failures you
-should try using the SMTP Transport instead. Swift Mailer isn't doing the work
-here, it's simply passing the work to somebody else (i.e.
-``sendmail``).
+You can think of the Sendmail Transport as a sort of asynchronous SMTP Transport
+-- though if you have problems with delivery failures you should try using the
+SMTP Transport instead. Swift Mailer isn't doing the work here, it's simply
+passing the work to somebody else (i.e. ``sendmail``).
 
 Using the Sendmail Transport
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 To use the Sendmail Transport you simply need to call
-``Swift_SendmailTransport::newInstance()`` with the command as a
-parameter.
+``Swift_SendmailTransport::newInstance()`` with the command as a parameter.
 
-To use the Sendmail Transport you need to know where
-``sendmail`` or another MTA exists on the server. Swift Mailer
-uses a default value of ``/usr/sbin/sendmail``, which should
-work on most systems.
+To use the Sendmail Transport you need to know where ``sendmail`` or another MTA
+exists on the server. Swift Mailer uses a default value of
+``/usr/sbin/sendmail``, which should work on most systems.
 
 You specify the entire command as a parameter (i.e. including the command line
-flags). Swift Mailer supports operational modes of "``-bs``"
-(default) and "``-t``".
+flags). Swift Mailer supports operational modes of "``-bs``" (default) and
+"``-t``".
 
 .. note::
 
-    If you run sendmail in "``-t``" mode you will get no feedback as to
-    whether or not sending has succeeded. Use "``-bs``" unless you have a
-    reason not to.
+    If you run sendmail in "``-t``" mode you will get no feedback as to whether 
+    or not sending has succeeded. Use "``-bs``" unless you have a reason not to.
 
 To use the Sendmail Transport:
 
@@ -321,10 +313,10 @@ process cannot be started successfully an Exception of type
 
     require_once 'lib/swift_required.php';
 
-    //Create the Transport
+    // Create the Transport
     $transport = Swift_SendmailTransport::newInstance('/usr/sbin/exim -bs');
 
-    //Create the Mailer using your created Transport
+    // Create the Mailer using your created Transport
     $mailer = Swift_Mailer::newInstance($transport);
 
 The Mail Transport
@@ -333,21 +325,20 @@ The Mail Transport
 The Mail Transport sends messages by delegating to PHP's internal
 ``mail()`` function.
 
-In my experience -- and others' -- the ``mail()``
-function is not particularly predictable, or helpful.
+In my experience -- and others' -- the ``mail()`` function is not particularly
+predictable, or helpful.
 
-Quite notably, the ``mail()`` function behaves entirely
-differently between Linux and Windows servers. On linux it uses
-``sendmail``, but on Windows it uses SMTP.
+Quite notably, the ``mail()`` function behaves entirely differently between
+Linux and Windows servers. On linux it uses ``sendmail``, but on Windows it uses
+SMTP.
 
-In order for the ``mail()`` function to even work at all
-``php.ini`` needs to be configured correctly, specifying the
-location of sendmail or of an SMTP server.
+In order for the ``mail()`` function to even work at all ``php.ini`` needs to be
+configured correctly, specifying the location of sendmail or of an SMTP server.
 
-The problem with ``mail()`` is that it "tries" to simplify things
-to the point that it actually makes things more complex due to poor interface
-design. The developers of Swift Mailer have gone to a lot of effort to make
-the Mail Transport work with a reasonable degree of consistency.
+The problem with ``mail()`` is that it "tries" to simplify things to the point 
+that it actually makes things more complex due to poor interface design. The 
+developers of Swift Mailer have gone to a lot of effort to make the Mail 
+Transport work with a reasonable degree of consistency.
 
 Serious drawbacks when using this Transport are:
 
@@ -363,8 +354,8 @@ Using the Mail Transport
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
 To use the Mail Transport you simply need to call
-``Swift_MailTransport::newInstance()``. It's unlikely you'll need
-to configure the Transport.
+``Swift_MailTransport::newInstance()``. It's unlikely you'll need to configure
+the Transport.
 
 To use the Mail Transport:
 
@@ -386,10 +377,10 @@ Messages will be sent using the ``mail()`` function.
 
         require_once 'lib/swift_required.php';
 
-        //Create the Transport
+        // Create the Transport
         $transport = Swift_MailTransport::newInstance();
 
-        //Create the Mailer using your created Transport
+        // Create the Mailer using your created Transport
         $mailer = Swift_Mailer::newInstance($transport);
 
 Available Methods for Sending Messages
@@ -409,15 +400,15 @@ an integer indicating the number of accepted recipients.
 
 .. note::
 
-    It's possible to find out which recipients were rejected -- we'll
-    cover that later in this chapter.
+    It's possible to find out which recipients were rejected -- we'll cover that
+    later in this chapter.
 
 Using the ``send()`` Method
 ...........................
 
-The ``send()`` method of the ``Swift_Mailer`` class
-sends a message using exactly the same logic as your Desktop mail client would
-use. Just pass it a Message and get a result.
+The ``send()`` method of the ``Swift_Mailer`` class sends a message using
+exactly the same logic as your Desktop mail client would use. Just pass it a
+Message and get a result.
 
 To send a Message with ``send()``:
 
@@ -436,28 +427,27 @@ The message will be sent just like it would be sent if you used your mail
 client. An integer is returned which includes the number of successful
 recipients. If none of the recipients could be sent to then zero will be
 returned, which equates to a boolean ``false``. If you set two
-``To:`` recipients and three ``Bcc:`` recipients in
-the message and all of the recipients are delivered to successfully then the
-value 5 will be returned.
+``To:`` recipients and three ``Bcc:`` recipients in the message and all of the
+recipients are delivered to successfully then the value 5 will be returned.
 
 .. code-block:: php
 
     require_once 'lib/swift_required.php';
 
-    //Create the Transport
+    // Create the Transport
     $transport = Swift_SmtpTransport::newInstance('localhost', 25);
 
-    //Create the Mailer using your created Transport
+    // Create the Mailer using your created Transport
     $mailer = Swift_Mailer::newInstance($transport);
 
-    //Create a message
+    // Create a message
     $message = Swift_Message::newInstance('Wonderful Subject')
       ->setFrom(array('john@doe.com' => 'John Doe'))
       ->setTo(array('receiver@domain.org', 'other@domain.org' => 'A name'))
       ->setBody('Here is the message itself')
       ;
   
-    //Send the message
+    // Send the message
     $numSent = $mailer->send($message);
 
     printf("Sent %d messages\n", $numSent);
@@ -507,19 +497,19 @@ email address on the ``To:`` field.
 
         require_once 'lib/swift_required.php';
 
-        //Create the Transport
+        // Create the Transport
         $transport = Swift_SmtpTransport::newInstance('localhost', 25);
 
-        //Create the Mailer using your created Transport
+        // Create the Mailer using your created Transport
         $mailer = Swift_Mailer::newInstance($transport);
 
-        //Create a message
+        // Create a message
         $message = Swift_Message::newInstance('Wonderful Subject')
           ->setFrom(array('john@doe.com' => 'John Doe'))
           ->setBody('Here is the message itself')
           ;
 
-        //Send the message
+        // Send the message
         $failedRecipients = array();
         $numSent = 0;
         $to = array('receiver@domain.org', 'other@domain.org' => 'A name');
@@ -586,7 +576,7 @@ added to the array provided by-reference.
           ->setBody( ... )
           ;
 
-        //Pass a variable name to the send() method
+        // Pass a variable name to the send() method
         if (!$mailer->send($message, $failures))
         {
           echo "Failures:";

vendor/swiftmailer/lib/classes/Swift/FileSpool.php

@@ -93,15 +93,17 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
       /* We try an exclusive creation of the file
        * This is an atomic operation, it avoid locking mechanism
        */
-      $fp=fopen($fileName.'.message', 'x');
-      if ($fp) 
+      $fp = @fopen($fileName.'.message', 'x');
+      if (false !== $fp)
       {
-        fwrite($fp, $ser);
-        fclose($fp);
-        
-        return;
-      } 
-      else 
+        if (false === fwrite($fp, $ser))
+        {
+          return false;
+        }
+
+        return fclose($fp);
+      }
+      else
       {
         /* The file allready exists, we try a longer fileName
          */

vendor/swiftmailer/lib/classes/Swift/MemorySpool.php

@@ -44,10 +44,13 @@ class Swift_MemorySpool implements Swift_Spool
    * Stores a message in the queue.
    *
    * @param Swift_Mime_Message $message The message to store
+   *
+   * @return boolean Whether the operation has succeeded
    */
   public function queueMessage(Swift_Mime_Message $message)
   {
     $this->messages[] = $message;
+    return true;
   }
 
   /**
@@ -60,6 +63,11 @@ class Swift_MemorySpool implements Swift_Spool
    */
   public function flushQueue(Swift_Transport $transport, &$failedRecipients = null)
   {
+    if (!$this->messages)
+    {
+      return 0;
+    }
+
     if (!$transport->isStarted())
     {
       $transport->start();

vendor/swiftmailer/lib/classes/Swift/Spool.php

@@ -35,6 +35,8 @@ interface Swift_Spool
   /**
    * Queues a message.
    * @param Swift_Mime_Message $message The message to store
+   *
+   * @return boolean Whether the operation has succeeded
    */
   public function queueMessage(Swift_Mime_Message $message);
 

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

@@ -46,11 +46,11 @@ class Swift_Transport_SimpleMailInvoker implements Swift_Transport_MailInvoker
   {
     if (!ini_get('safe_mode'))
     {
-      return mail($to, $subject, $body, $headers, $extraParams);
+      return @mail($to, $subject, $body, $headers, $extraParams);
     }
     else
     {
-      return mail($to, $subject, $body, $headers);      
+      return @mail($to, $subject, $body, $headers);      
     }
   }
   

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

@@ -260,7 +260,8 @@ class Swift_Transport_StreamBuffer
     {
     	$options['socket']['bindto']=$this->_params['sourceIp'].':0';
     }
-    if (!$this->_stream = stream_socket_client($host.':'.$this->_params['port'], $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, stream_context_create($options)))
+    $this->_stream = @stream_socket_client($host.':'.$this->_params['port'], $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, stream_context_create($options));
+    if (false === $this->_stream)
     {
       throw new Swift_TransportException(
         'Connection could not be established with host ' . $this->_params['host'] .

vendor/symfony/.travis.yml

@@ -1,6 +1,7 @@
 language: php
 
 php:
+  - 5.3.2
   - 5.3
   - 5.4
 

vendor/symfony/CHANGELOG-2.0.md

@@ -7,6 +7,42 @@ 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.11 (2012-02-24)
+
+ * 3e64d36: [Serializer] Fix XML decoding attack vector through external entities
+ * 66d0d3d: [FrameworkBundle] Fix a bug in the RedirectableUrlMatcher
+ * 24a3cd3: Finder - allow sorting when searching in multiple directories
+ * 6e75fd1: Resolves issue with spl_autoload_register creating new copies of the container and passing that into the closure.
+ * d02ca25: [MonologBundle] Fixed a bug when adding a processor on a service handler
+ * 2434552: [Translation] Fixed fallback location if location is longer than three characters (possibly by mistake).
+ * ec7fb0b: [Routing] added a proper exception when a route pattern references the same variable more than once (closes #3344)
+ * beb4fc0: [WIP][Locale] StubIntlDateFormatter::parse was throwing exception instead of returning Boolean false like intl implementation
+
+* 2.0.10 (2012-02-06)
+
+ * 8e13095: Fixed the unescaping of parameters to handle arrays
+ * c3f0ec7: Make DoctrineBundle fowards compatible with Doctrine 2.2
+ * e814d27: [FormType] Fixed broken MoneyType regexp for JPY
+ * 7f96c8a: [HttpKernel] Prevent php script execution in cached ESI pages using HttpCache
+ * 959614b: Use reflection to determaine the correct path for component validation.xml file
+ * cacc880: [Bugfix][Locale] Fixed incomplete Locale data loading
+ * d67d419: [HttpFoundation] added missing trustProxy condition
+ * efce640: [Yaml][Parser] throw an exception if not readable
+ * aa58330: [Form] fixed flawed condition
+ * 253eeba: [BugFix][Validator] Fix for PHP incosistent behaviour of ArrayAccess
+ * 0507840: Prevent parameters from overwriting the template filename.
+ * 9bc41d0: [HttpFoundation] Fixed #3053
+ * 9441c46: [DependencyInjection] PhpDumper, fixes #2730
+
+* 2.0.9 (2012-01-06)
+
+ * 0492290: [Console] added a missing method (closes #3043)
+ * e09b523: updated Twig to 1.5.1 to fix a regression
+ * 261325d: Cast $query['params'] to array to ensure it is a valid argument for the foreach.
+ * 85ca8e3: ParameterBag no longer resolves parameters that have spaces.
+ * aacb2de: use the forward compat version in the Filesystem service
+ * 41950a6: [WebProfilerBundle] add margin-bottom to caption
+
 * 2.0.8 (2011-12-26)
 
  * adea589: [Twig] made code compatible with Twig 1.5

vendor/symfony/CONTRIBUTORS.md

@@ -7,104 +7,78 @@ Symfony2 is the result of the work of many people who made the code better
  - Fabien Potencier (fabpot)
  - Bernhard Schussek (bschussek)
  - Johannes (schmittjoh)
- - Jordi Boggiano (Seldaek)
  - Kris Wallsmith (kriswallsmith)
+ - Victor Berchet (vicb)
+ - Jordi Boggiano (Seldaek)
  - Christophe Coevoet (stof)
+ - Ryan Weaver (weaverryan)
+ - Pascal Borreli (pborreli)
  - Lukas Kahwe Smith (lsmith77)
- - Victor Berchet (vicb)
- - Alexandre Salomé (alexandresalome)
  - Benjamin Eberlei (beberlei)
+ - Igor Wiedler (igorw)
  - Joseph Bielawski (stloyd)
- - stealth35 (stealth35)
- - Ryan Weaver (weaverryan)
- - Pascal Borreli (pborreli)
- - Eric Clemmons (ericclemmons)
  - Jeremy Mikola (jmikola)
- - Henrik Westphal (snc)
- - Igor Wiedler (igorw)
- - Drak (drak)
- - Tigran Azatyan (tigranazatyan)
- - Jordan Alliot (jalliot)
  - Hugo Hamon (hhamon)
- - Miha Vrhovnik (mvrhov)
- - Arnout Boks (aboks)
  - Jonathan H. Wage (jwage)
- - Benjamin Dulau (benjamindulau)
- - Martin Hasoň (hason)
  - Thibault Duplessis (ornicar)
- - Helmer Aaviksoo (helmer)
- - Excel Web Zone (excelwebzone)
- - Jacob Dreesen (jdreesen)
+ - Alexandre Salomé (alexandresalome)
  - Bulat Shakirzyanov (avalanche123)
  - Eriksen Costa (eriksencosta)
  - Francis Besset (francisbesset)
- - Richard Shank (IamPersistent)
- - Wotre (Wotre)
- - dbu
+ - stealth35 (stealth35)
+ - Miha Vrhovnik (mvrhov)
  - Henrik Bjørnskov (henrikbjorn)
- - yethee (yethee)
- - Lenar Lõhmus (lenar)
- - Richard Miller (richardmiller)
- - Dariusz Górecki (canni)
+ - Martin Hasoň (hason)
+ - Eric Clemmons (ericclemmons)
  - Konstantin Kudryashov (everzet)
- - Brikou CARRE (brikou)
- - Daniel Holmes (danielholmes)
- - William DURAND (willdurand)
+ - Dariusz Górecki (canni)
+ - Arnout Boks (aboks)
  - Brandon Turner (blt04)
- - brki (brki)
  - Hidenori Goto (hidenorigoto)
+ - Henrik Westphal (snc)
  - John Wards (johnwards)
+ - Drak (drak)
+ - yethee (yethee)
+ - Lenar Lõhmus (lenar)
+ - Brikou CARRE (brikou)
+ - Daniel Holmes (danielholmes)
  - Antoine Hérault (Herzult)
- - Danny Berger (dpb587)
- - Alif Rachmawadi (alifity)
  - Fabien Pennequin (FabienPennequin)
- - Tobias Schultze (Tobion)
  - Marc Weistroff (marcw)
- - Julien Brochet (aerialls)
- - Michel Salib (michelsalib)
- - Marcin Chylek (SongoQ)
- - Christian Raue (craue)
- - superjavason (superjavason)
- - Thomas (rande)
- - Joseph Rouff (rouffj)
+ - Jacob Dreesen (jdreesen)
+ - Richard Shank (IamPersistent)
+ - William DURAND (willdurand)
+ - Jordan Alliot (jalliot)
+ - Excel Web Zone (excelwebzone)
  - Katsuhiro OGAWA (fivestar)
+ - Tobias Schultze (Tobion)
  - blue-eyes (blue-eyes)
- - Daniel Gomes (danielcsgomes)
- - Miquel Rodríguez Telep (mrtorrent)
- - flevour (flevour)
- - Tim Nagel (merk)
  - Robert Schönthal (digitalkaoz)
+ - Tim Nagel (merk)
  - Michel Weimerskirch (mweimerskirch)
- - Michele Orselli (micheleorselli)
+ - Tigran Azatyan (tigranazatyan)
+ - Christian Raue (craue)
+ - Helmer Aaviksoo (helmer)
  - Jakub Zalas (jakzal)
+ - Javier Eguiluz (javiereguiluz)
  - Matthieu Vachon (maoueh)
  - Amal Raghav (kertz)
  - Artur Kotyrba (udat)
- - Bernd Matzner (bmatzner)
+ - Kevin Bond (kbond)
+ - umpirsky (umpirsky)
  - Clément JOBEILI (dator)
- - Tom Klingenberg (ktomk)
- - Thomas Bibb (thomasbibb)
- - Marek Kalnik (marekkalnik)
- - Oscar Cubo Medina (ocubom)
- - xaav
- - Pierre Minnieur (pminnieur)
- - Neil Katin
+ - Bart van den Burg (Burgov)
+ - Benjamin Dulau (benjamindulau)
  - Noel GUILBERT (noelg)
- - Klein Florian (docteurklein)
+ - Andrej Hudec (pulzarraider)
  - Martin Schuhfuss (usefulthink)
- - stloyd
+ - Thomas (rande)
  - Dennis Benkert (denderello)
- - Bart van den Burg (Burgov)
  - Matthieu Bontemps (mbontemps)
- - Kirill chEbba Chebunin (chEbba)
- - John Carr (Jc2k)
- - jdewit (jdewit)
- - Teo (teo-sk)
  - Dustin Whittle (dustinwhittle)
  - Jean-François PHILIPPE (jfphilippe)
  - Justin Hileman (bobthecow)
  - Sven Paulus (subsven)
- - umpirsky (umpirsky)
  - Xavier Perez (DuoSRX)
  - Brouznouf (Brouznouf)
  - Pablo Godel (pgodel)
@@ -113,134 +87,156 @@ Symfony2 is the result of the work of many people who made the code better
  - Francois Zaninotto (fzaninotto)
  - Xavier Montaña (xmontana)
  - Arjen Brouwer (arjenjb)
+ - Alif Rachmawadi (subosito)
  - Boussekeyt Jules (gordonslondon)
- - Thomas Adam (tecbot)
  - Jan Sorgalla (jsor)
- - Douglas Greenshields (shieldo)
  - Lee McDermott (lmcd)
- - Shein Alexey (conf)
- - Manuel de Ruiter (ManuelAC)
+ - Richard Miller (richardmiller)
  - Jeroen Hoek (jdhoek)
- - Robert Gruendler (pulse00)
  - geoffrey
  - Matthew Lewinski (lewinski)
+ - Wotre (Wotre)
+ - Pierre Minnieur (pminnieur)
+ - Daniel Gomes (danielcsgomes)
+ - Danny Berger (dpb587)
  - dlsniper (dlsniper)
  - Jérémie Augustin (jaugustin)
- - ondrowan (ondrowan)
- - Costin Bereveanu (schniper)
+ - Sebastian Hörl (blogsh)
+ - Joseph Rouff (rouffj)
+ - Manuel Kiessling (ManuelKiessling)
+ - dbu
  - asm89 (asm89)
- - Andrej Hudec (pulzarraider)
+ - Julien Brochet (aerialls)
  - Aurelijus Valeiša (aurelijus)
+ - Gustavo Piltcher
  - Ray (rrehbeindoi)
+ - Gordon Franke (gimler)
  - Adrian Rudnik (kreischweide)
- - Dustin Dobervich (dustin10)
+ - Gábor Egyed (1ed)
  - Andréia Bohner (andreia)
  - Yuen-Chi Lian (yclian)
  - Greg Thornton (xdissent)
- - andrewtch (andrewtch)
+ - Lars Strojny (lstrojny)
+ - Costin Bereveanu (schniper)
+ - Douglas Greenshields (shieldo)
  - Konstantin Leboev (realmfoo)
- - Grégoire Paris (greg0ire)
  - Donald Tyler (Chekote)
  - Kai
  - Gyula Sallai (thesalla)
  - Sergey Linnik (Partugal)
  - Laszlo Korte (laszlokorte)
- - Jonathan Ingram (jonathaningram)
+ - Toni Uebernickel (havvg)
  - Hubert LECORCHE (hlecorche)
  - Michael Ridgway (mridgway)
  - Stepan Tanasiychuk (stfalcon)
  - Bertrand Zuchuat (Garfield-fr)
- - Adam Monsen (meonkeys)
- - Xavier HAUSHERR (xkobal)
+ - brki (brki)
+ - Michel Salib (michelsalib)
  - Jan Schumann (janschumann)
- - Vadim Tyukov (vatson)
+ - Michele Orselli (micheleorselli)
  - Asier Illarramendi (doup)
- - Gábor Egyed (1ed)
  - Shigenobu Nishikawa (shishi)
+ - Sebastian Bergmann (sebastianbergmann)
  - Marcin Sikoń (marphi)
+ - Miquel Rodríguez Telep (mrtorrent)
+ - Peter Kokot (maastermedia)
  - Laurent Bachelier (laurentb)
  - Fabian Lange (CodingFabian)
  - Yoshio HANAWA
  - Pablo Díez (pablodip)
+ - ondrowan (ondrowan)
  - Benoit Tirmarche (mcbennn)
  - Grégoire Passault
  - De Cock Xavier (xdecock)
  - Cristian González Sánchez (cristiangsp)
+ - Manuel Reinhard (sprain)
+ - Thomas Adam (tecbot)
  - Nils Adermann (naderman)
  - Tobias Naumann (tna)
+ - Shein Alexey (conf)
+ - Jonathan Ingram (jonathaningram)
  - Steven Surowiec (steves)
+ - Marcin Chylek (SongoQ)
  - arnaud-lb (arnaud-lb)
  - Ivan Rey (ivanrey)
+ - Ryan Rogers (timewasted)
  - Ned Schwartz (theinterned)
- - Gordon Franke (gimler)
  - Aurélien Fredouelle (AurelC2G)
- - David Soria Parra (dsp)
+ - flevour (flevour)
+ - Oscar Cubo Medina (ocubom)
  - Geoffrey Tran (geoffreytran)
  - Christian Schaefer (caefer)
  - Elliot Anderson (elliot)
- - Kevin Bond (kbond)
+ - Olivier Dolbeau (odolbeau)
  - José Nahuel Cuesta Luengo (ncuesta)
- - Sebastian Marek (proofek)
+ - Dustin Dobervich (dustin10)
  - erheme318 (erheme318)
  - Michael Holm (hollodk)
  - Rostyslav Kinash
  - yktd26 (yktd26)
- - Javier Eguiluz (javiereguiluz)
  - umpirski (umpirski)
- - Sebastian Bergmann (sebastianbergmann)
  - Hossein Bukhamsin (husinluck)
  - Fabrice Bernhard (fabriceb)
  - develop
  - 77web (77web)
  - Joshua Nye (zerosanity)
+ - andrewtch (andrewtch)
  - markchalloner (markchalloner)
  - Michael Williams (mtotheikle)
  - Casper Valdemar Poulsen
- - pscheit (pscheit)
+ - franmomu (franmomu)
  - Degory Valentine
  - Krzysiek Łabuś (Crozin)
+ - superjavason (superjavason)
  - Jan Prieser (jaypea)
+ - Tom Klingenberg (ktomk)
  - paulkamer (paulkamer)
  - Peter Kruithof (pkruithof)
  - Albert Jessurum (ajessu)
  - frost-nzcr4 (frost-nzcr4)
  - Abhoryo (Abhoryo)
  - Fabian Vogler (fabian)
+ - Maksim Kotlyar (makasim)
  - Grégoire Passault (Gregwar)
+ - Manuel de Ruiter (ManuelAC)
  - Cyril Quintin (cyqui)
+ - Gerard van Helden (drm)
  - kazusuke sasezaki (sasezaki)
- - cim-dch (cim-dch)
- - Julien DIDIER (juliendidier)
+ - Matt Robinson (inanimatt)
  - Chris Smith (cs278)
  - Derek ROTH (DerekRoth)
  - mwsaz
- - Juan M Martínez
- - Matt Lehner (mlehner)
  - Emil Einarsson (Einarsson)
  - Don Pinkster
  - Michael Roterman (wtfzdotnet)
  - Arno Geurts
- - ds (dantleech)
+ - Marek Kalnik (marekkalnik)
  - Daniel Cestari (dcestari)
  - Magnus Nordlander (magnusnordlander)
- - Pavel Campr (pcampr)
- - Markus Tacker (tacker)
+ - Adam Monsen (meonkeys)
+ - Robert Gruendler (pulse00)
  - Benoît Merlet (trompette)
  - Jan Behrens (deegital)
  - sensio
  - Théophile Helleboid - chtitux (chtitux)
+ - xaav
+ - Anton Babenko (antonbabenko)
  - 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)
  - John Kary (johnkary)
  - Martijn Evers (martijn4evers)
  - Jeremy Bush (zombor)
  - Davide Borsatto (davideborsatto)
  - kaiwa
+ - Neil Katin
  - Gustavo Adrian
  - Nicolas Fabre (nfabre)
  - heccjj (heccjj)
@@ -248,27 +244,33 @@ Symfony2 is the result of the work of many people who made the code better
  - Cédric Lahouste (RapotOR)
  - George Giannoulopoulos (dotoree)
  - Alberto Pirovano (geezmo)
+ - Klein Florian (docteurklein)
  - JerikVenture (JerikVenture)
  - Evan Kaufman (EvanK)
  - meckhardt (meckhardt)
+ - Mike Lively (mlively)
  - Sebastian Ionescu
  - Dirk Pahl (dirkaholic)
  - Nicolas Badey (Nico-B)
+ - pscheit (pscheit)
  - Bouke Haarsma (Bouke)
  - Lars Strojny
  - Yrwein (Yrwein)
  - pborreli
+ - Thomas Bibb (thomasbibb)
+ - Ivan Kurnosov
+ - stloyd
  - Christoph Nißle (DerStoffel)
  - Luis Muñoz
  - Oleg Zinchenko (cystbear)
+ - Grégoire Paris (greg0ire)
  - Guilherme Blanco (guilhermeblanco)
  - Stefano Sala (stewe)
  - Romain Dorgueil
  - Benjamin Lévêque (benji07)
- - Sebastian Hörl (blogsh)
  - Benjamin Zikarsky (bzikarsky)
+ - alefranz (alefranz)
  - Andy Stanberry (cranberyxl)
- - Gerard van Helden (drm)
  - Alessio (ioalessio)
  - Jérôme Macias (jeromemacias)
  - Philip Dahlstrøm (phidah)
@@ -283,12 +285,16 @@ Symfony2 is the result of the work of many people who made the code better
  - 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)
  - Hugo Hamon
  - Lenar Lõhmus
+ - Juan M Martínez
  - Alex
  - agilemedialab (agilemedialab)
  - Masao Maeda (brtriver)
@@ -298,23 +304,29 @@ Symfony2 is the result of the work of many people who made the code better
  - Gabriel Birke (gbirke)
  - Osman Üngür (import)
  - Robert Campbell (jayrulez)
+ - Maerlyn (maerlyn)
  - Matthew Davis (mdavis1982)
+ - Matt Lehner (mlehner)
+ - Matthias (mpdude)
  - Jimmy Leger (redpanda)
- - Tom Van Looy
  - Nicolas A. Bérard-Nault
  - Alexey Popkov
  - Adán Lobato (adanlobato)
  - chesteroni (chesteroni)
  - Elnur Abdurrakhimov (elnur)
  - Beau Simensen (simensen)
+ - Tom Van Looy (tvlooy)
  - Juan Ases García (Ases)
  - FabienD (FabienD)
+ - Jörg Rühl (LennyLinux)
  - Matt Drollette (MDrollette)
  - Skorney (Skorney)
  - Vincent (Vincent-P)
+ - Drew Butler
  - Pierre-Louis LAUNAY
  - Sébastien HOUZE
  - Sergiy Sokolenko
+ - Bernd Matzner (bmatzner)
  - Vladimir Sazhin (cannie)
  - catchamonkey (catchamonkey)
  - Christian Stocker (chregu)
@@ -322,31 +334,45 @@ Symfony2 is the result of the work of many people who made the code better
  - Luis Cordova (cordoval)
  - Damien Alexandre (damienalexandre)
  - Damon Jones (damonjones)
+ - ds (dantleech)
  - Djama Suemenich (djama)
  - Daniel Londero (dlondero)
  - dorkitude (dorkitude)
+ - David Soria Parra (dsp)
  - Kousuke Ebihara (ebihara)
  - Vladislav  (ideea)
+ - John Carr (Jc2k)
+ - jdewit (jdewit)
+ - Justin Rainbow (justinrainbow)
  - Abdulkadir N. A. (kadeer)
  - Krzysztof Menżyk (krymen)
  - kwiateusz (kwiateusz)
  - Samuel Laulhau (lalop)
+ - Javier López (loalf)
  - Penny Leach (mjollnir)
  - Michael Schneider (mschneid)
- - Drew Butler (nodrew)
  - Oncle Tom (oncletom)
  - ouardisoft (ouardisoft)
+ - Pavel Campr (pcampr)
  - Petr Jaroš (petajaros)
  - pzwosta (pzwosta)
+ - Rafael Dohms (rdohms)
  - Ruud Kamphuis (ruudk)
+ - Markus Tacker (tacker)
  - Matt Fitzgerald (tirnanog06)
+ - Tyler Stroud (tystr)
  - Vyacheslav Slinko (vslinko)
  - Josiah (web-dev)
+ - Xavier HAUSHERR (xkobal)
  - Gustavo Adrian
  - max
+ - Hans (drublic)
+ - m0ppers (m0ppers)
  - Marcel Beerta (mazen)
  - Muharrem Demirci (mdemirci)
  - meze (meze)
+ - Michael (mshtukin)
  - Nicolas de Marqué Fromentin (nicodmf)
  - Florent Cailhol (ooflorent)
  - Pierre (ptheg)
+ - Teo (teo-sk)

vendor/symfony/check_cs

@@ -94,7 +94,9 @@ foreach ($finder as $file) {
     }
 
     // [Structure] elseif, not else if
-    $new = preg_replace('/} else if \(/', '} elseif (', $new);
+    if ('twig' !== $file->getExtension()) {
+        $new = preg_replace('/} else if \(/', '} elseif (', $new);
+    }
 
     if ($new != $old) {
         $count++;

vendor/symfony/composer.json

@@ -4,7 +4,6 @@
     "description": "The Symfony PHP framework",
     "keywords": ["framework"],
     "homepage": "http://symfony.com",
-    "version": "2.0.7",
     "license": "MIT",
     "authors": [
         {
@@ -21,7 +20,7 @@
         "doctrine/common": "2.1.*",
         "monolog/monolog": "1.0.*",
         "swiftmailer/swiftmailer": ">=4.1.2,<4.2-dev",
-        "twig/twig": ">=1.1,<1.5-dev"
+        "twig/twig": ">=1.1,<2.0-dev"
     },
     "replace": {
         "symfony/doctrine-bridge": "self.version",

vendor/symfony/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php

@@ -88,7 +88,7 @@ class DoctrineDataCollector extends DataCollector
     private function sanitizeQueries($queries)
     {
         foreach ($queries as $i => $query) {
-            foreach ($query['params'] as $j => $param) {
+            foreach ((array)$query['params'] as $j => $param) {
                 $queries[$i]['params'][$j] = $this->varToString($param);
             }
         }

vendor/symfony/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php

@@ -185,7 +185,7 @@ class EntityChoiceList extends ArrayChoiceList
             } else {
                 // Otherwise expect a __toString() method in the entity
                 if (!method_exists($entity, '__toString')) {
-                    throw new FormException('Entities passed to the choice field must have a "__toString()" method defined (or you can also override the "property" option).');
+                    throw new FormException(sprintf('Entity "%s" passed to the choice field must have a "__toString()" method defined (or you can also override the "property" option).', $this->class));
                 }
 
                 $value = (string) $entity;

vendor/symfony/src/Symfony/Bridge/Doctrine/composer.json

@@ -4,7 +4,6 @@
     "description": "Symfony Doctrine Bridge",
     "keywords": [],
     "homepage": "http://symfony.com",
-    "version": "2.0.7",
     "license": "MIT",
     "authors": [
         {

vendor/symfony/src/Symfony/Bridge/Monolog/composer.json

@@ -4,7 +4,6 @@
     "description": "Symfony Monolog Bridge",
     "keywords": [],
     "homepage": "http://symfony.com",
-    "version": "2.0.7",
     "license": "MIT",
     "authors": [
         {

vendor/symfony/src/Symfony/Bridge/Swiftmailer/composer.json

@@ -4,7 +4,6 @@
     "description": "Symfony Swiftmailer Bridge",
     "keywords": [],
     "homepage": "http://symfony.com",
-    "version": "2.0.7",
     "license": "MIT",
     "authors": [
         {

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

@@ -67,7 +67,7 @@ class FormExtension extends \Twig_Extension
     public function getTokenParsers()
     {
         return array(
-            // {% form_theme form "SomeBungle::widgets.twig" %}
+            // {% form_theme form "SomeBundle::widgets.twig" %}
             new FormThemeTokenParser(),
         );
     }

vendor/symfony/src/Symfony/Bridge/Twig/composer.json

@@ -4,7 +4,6 @@
     "description": "Symfony Twig Bridge",
     "keywords": [],
     "homepage": "http://symfony.com",
-    "version": "2.0.7",
     "license": "MIT",
     "authors": [
         {
@@ -18,7 +17,7 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "twig/twig": ">=1.1,<1.5-dev"
+        "twig/twig": ">=1.1,<2.0-dev"
     },
     "suggest": {
         "symfony/form": "self.version",

vendor/symfony/src/Symfony/Bundle/DoctrineAbstractBundle/composer.json

@@ -4,7 +4,6 @@
     "description": "Symfony DoctrineAbstractBundle",
     "keywords": [],
     "homepage": "http://symfony.com",
-    "version": "2.0.7",
     "license": "MIT",
     "authors": [
         {

vendor/symfony/src/Symfony/Bundle/DoctrineBundle/Command/CreateDatabaseDoctrineCommand.php

@@ -28,7 +28,7 @@ class CreateDatabaseDoctrineCommand extends DoctrineCommand
     {
         $this
             ->setName('doctrine:database:create')
-            ->setDescription('Create the configured databases')
+            ->setDescription('Creates the configured databases')
             ->addOption('connection', null, InputOption::VALUE_OPTIONAL, 'The connection to use for this command')
             ->setHelp(<<<EOT
 The <info>doctrine:database:create</info> command creates the default

vendor/symfony/src/Symfony/Bundle/DoctrineBundle/Command/DropDatabaseDoctrineCommand.php

@@ -27,7 +27,7 @@ class DropDatabaseDoctrineCommand extends DoctrineCommand
     {
         $this
             ->setName('doctrine:database:drop')
-            ->setDescription('Drop the configured databases')
+            ->setDescription('Drops the configured databases')
             ->addOption('connection', null, InputOption::VALUE_OPTIONAL, 'The connection to use for this command')
             ->addOption('force', null, InputOption::VALUE_NONE, 'Set this parameter to execute this action')
             ->setHelp(<<<EOT

vendor/symfony/src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntitiesDoctrineCommand.php

@@ -31,7 +31,7 @@ class GenerateEntitiesDoctrineCommand extends DoctrineCommand
         $this
             ->setName('doctrine:generate:entities')
             ->setAliases(array('generate:doctrine:entities'))
-            ->setDescription('Generate entity classes and method stubs from your mapping information')
+            ->setDescription('Generates entity classes and method stubs from your mapping information')
             ->addArgument('name', InputArgument::REQUIRED, 'A bundle name, a namespace, or a class name')
             ->addOption('path', null, InputOption::VALUE_REQUIRED, 'The path where to generate entities when it cannot be guessed')
             ->addOption('no-backup', null, InputOption::VALUE_NONE, 'Do not backup existing entities files.')

vendor/symfony/src/Symfony/Bundle/DoctrineBundle/Command/ImportMappingDoctrineCommand.php

@@ -37,7 +37,7 @@ class ImportMappingDoctrineCommand extends DoctrineCommand
             ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command')
             ->addOption('filter', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'A string pattern used to match entities that should be mapped.')
             ->addOption('force', null, InputOption::VALUE_NONE, 'Force to overwrite existing mapping files.')
-            ->setDescription('Import mapping information from an existing database')
+            ->setDescription('Imports mapping information from an existing database')
             ->setHelp(<<<EOT
 The <info>doctrine:mapping:import</info> command imports mapping information
 from an existing database:

vendor/symfony/src/Symfony/Bundle/DoctrineBundle/Command/InfoDoctrineCommand.php

@@ -28,7 +28,7 @@ class InfoDoctrineCommand extends DoctrineCommand
         $this
             ->setName('doctrine:mapping:info')
             ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command')
-            ->setDescription('Show basic information about all mapped entities')
+            ->setDescription('Shows basic information about all mapped entities')
             ->setHelp(<<<EOT
 The <info>doctrine:mapping:info</info> shows basic information about which
 entities exist and possibly if their mapping information contains errors or

vendor/symfony/src/Symfony/Bundle/DoctrineBundle/Command/Proxy/ClearMetadataCacheDoctrineCommand.php

@@ -30,7 +30,7 @@ class ClearMetadataCacheDoctrineCommand extends MetadataCommand
 
         $this
             ->setName('doctrine:cache:clear-metadata')
-            ->setDescription('Clear all metadata cache for a entity manager')
+            ->setDescription('Clears all metadata cache for a entity manager')
             ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command')
             ->setHelp(<<<EOT
 The <info>doctrine:cache:clear-metadata</info> command clears all metadata

vendor/symfony/src/Symfony/Bundle/DoctrineBundle/Command/Proxy/ClearQueryCacheDoctrineCommand.php

@@ -30,7 +30,7 @@ class ClearQueryCacheDoctrineCommand extends QueryCommand
 
         $this
             ->setName('doctrine:cache:clear-query')
-            ->setDescription('Clear all query cache for a entity manager')
+            ->setDescription('Clears all query cache for a entity manager')
             ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command')
             ->setHelp(<<<EOT
 The <info>doctrine:cache:clear-query</info> command clears all query cache for

vendor/symfony/src/Symfony/Bundle/DoctrineBundle/Command/Proxy/ClearResultCacheDoctrineCommand.php

@@ -30,7 +30,7 @@ class ClearResultCacheDoctrineCommand extends ResultCommand
 
         $this
             ->setName('doctrine:cache:clear-result')
-            ->setDescription('Clear result cache for a entity manager')
+            ->setDescription('Clears result cache for a entity manager')
             ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command')
             ->setHelp(<<<EOT
 The <info>doctrine:cache:clear-result</info> command clears all result cache

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

@@ -42,9 +42,9 @@ class DoctrineBundle extends Bundle
         if ($this->container->hasParameter('doctrine.orm.proxy_namespace')) {
             $namespace = $this->container->getParameter('doctrine.orm.proxy_namespace');
             $dir = $this->container->getParameter('doctrine.orm.proxy_dir');
-            $container = $this->container;
+            $container =& $this->container;
 
-            spl_autoload_register(function($class) use ($namespace, $dir, $container) {
+            spl_autoload_register(function($class) use ($namespace, $dir, &$container) {
                 if (0 === strpos($class, $namespace)) {
                     $className = substr($class, strlen($namespace) +1);
                     $file = $dir.DIRECTORY_SEPARATOR.$className.'.php';

vendor/symfony/src/Symfony/Bundle/DoctrineBundle/Mapping/MetadataFactory.php

@@ -75,8 +75,8 @@ class MetadataFactory
 
         $all = $metadata->getMetadata();
         if (class_exists($class)) {
-            $r = $all[0]->getReflectionClass();
-            $path = $this->getBasePathForClass($class, $r->getNamespacename(), dirname($r->getFilename()));
+            $r = new \ReflectionClass($all[0]->name);
+            $path = $this->getBasePathForClass($class, $r->getNamespaceName(), dirname($r->getFilename()));
             $metadata->setNamespace($r->getNamespacename());
         } elseif (!$path) {
             throw new \RuntimeException(sprintf('Unable to determine where to save the "%s" class (use the --path option).', $class));
@@ -104,8 +104,8 @@ class MetadataFactory
 
         $all = $metadata->getMetadata();
         if (class_exists($all[0]->name)) {
-            $r = $all[0]->getReflectionClass();
-            $path = $this->getBasePathForClass($namespace, $r->getNamespacename(), dirname($r->getFilename()));
+            $r = new \ReflectionClass($all[0]->name);
+            $path = $this->getBasePathForClass($namespace, $r->getNamespaceName(), dirname($r->getFilename()));
         } elseif (!$path) {
             throw new \RuntimeException(sprintf('Unable to determine where to save the "%s" class (use the --path option).', $all[0]->name));
         }

vendor/symfony/src/Symfony/Bundle/DoctrineBundle/composer.json

@@ -4,7 +4,6 @@
     "description": "Symfony DoctrineBundle",
     "keywords": [],
     "homepage": "http://symfony.com",
-    "version": "2.0.7",
     "license": "MIT",
     "authors": [
         {

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php

@@ -35,7 +35,7 @@ class AssetsInstallCommand extends ContainerAwareCommand
                 new InputArgument('target', InputArgument::REQUIRED, 'The target directory (usually "web")'),
             ))
             ->addOption('symlink', null, InputOption::VALUE_NONE, 'Symlinks the assets instead of copying it')
-            ->setDescription('Install bundles web assets under a public web directory')
+            ->setDescription('Installs bundles web assets under a public web directory')
             ->setHelp(<<<EOT
 The <info>assets:install</info> command installs bundle assets into a given
 directory (e.g. the web directory).

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php

@@ -37,7 +37,7 @@ class CacheClearCommand extends ContainerAwareCommand
             ->setDefinition(array(
                 new InputOption('no-warmup', '', InputOption::VALUE_NONE, 'Do not warm up the cache'),
             ))
-            ->setDescription('Clear the cache')
+            ->setDescription('Clears the cache')
             ->setHelp(<<<EOF
 The <info>cache:clear</info> command clears the application cache for a given environment
 and debug mode:

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

@@ -554,7 +554,8 @@ class FrameworkExtension extends Extension
 
     private function getValidatorXmlMappingFiles(ContainerBuilder $container)
     {
-        $files = array(__DIR__.'/../../../Component/Form/Resources/config/validation.xml');
+        $reflClass = new \ReflectionClass('Symfony\Component\Form\FormInterface');
+        $files = array(dirname($reflClass->getFileName()).'/Resources/config/validation.xml');
         $container->addResource(new FileResource($files[0]));
 
         foreach ($container->getParameter('kernel.bundles') as $bundle) {

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

@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\FrameworkBundle;
 
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml

@@ -7,7 +7,7 @@
     <parameters>
         <parameter key="event_dispatcher.class">Symfony\Bundle\FrameworkBundle\ContainerAwareEventDispatcher</parameter>
         <parameter key="http_kernel.class">Symfony\Bundle\FrameworkBundle\HttpKernel</parameter>
-        <parameter key="filesystem.class">Symfony\Component\HttpKernel\Util\Filesystem</parameter>
+        <parameter key="filesystem.class">Symfony\Component\Filesystem\Filesystem</parameter>
         <parameter key="cache_warmer.class">Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerAggregate</parameter>
         <parameter key="file_locator.class">Symfony\Component\HttpKernel\Config\FileLocator</parameter>
     </parameters>

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

@@ -162,6 +162,10 @@
                 <source>This value is not a valid country</source>
                 <target>Aquest valor no és un país vàlid</target>
             </trans-unit>
+            <trans-unit id="41">
+                <source>This value is already used</source>
+                <target>Aquest valor ja s'ha utilitzat</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

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

@@ -162,6 +162,10 @@
                 <source>This value is not a valid country</source>
                 <target>Este valor no es un país válido</target>
             </trans-unit>
+            <trans-unit id="41">
+                <source>This value is already used</source>
+                <target>Este valor ya se ha utilizado</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

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

@@ -162,6 +162,10 @@
                 <source>This value is not a valid country</source>
                 <target>Ez az érték nem egy érvényes ország</target>
             </trans-unit>
+            <trans-unit id="41">
+                <source>This value is already used</source>
+                <target>Ez az érték már használva van</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>