symfony · fabpot · Sep 29, 2011 · Aug 19, 2011 · Aug 19, 2011 · Jul 29, 2011
diff --git a/CHANGELOG-2.1.md b/CHANGELOG-2.1.md
@@ -0,0 +1,77 @@
+CHANGELOG for 2.1.x
+===================
+
+This changelog references the relevant changes (bug and security fixes) done
+in 2.1 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.1.0...v2.1.1
+
+2.1.0
+-----
+
+### DoctrineBundle
+
+ * The `em` option for the `UniqueEntity` constraint is now optional (and should probably not be used anymore).
+
+### FrameworkBundle
+
+ * added a way to create relative symlinks when running assets:install command (--relative option)
+ * added Controller::getUser()
+ * [BC BREAK] assets_base_urls and base_urls merging strategy has changed
+ * changed the default profiler storage to use the filesystem instead of SQLite
+ * added support for placeholders in route defaults and requirements (replaced by the value set in the service container)
+
+### SecurityBundle
+
+ * added a validator for the user password
+
+### WebProfilerBundle
+
+ * The toolbar position can now be configured via the `position` option (can be `top` or `bottom`)
+
+### ClassLoader
+
+ * added support for loading globally-installed PEAR packages
+
+### DomCrawler
+
+ * added a way to get parsing errors for Crawler::addHtmlContent() and Crawler::addXmlContent() via libxml functions
+ * added support for submitting a form without a submit button
+
+### Finder
+
+ * Finder::exclude() now supports an array of directories as an argument
+
+### Form
+
+ * added Form::getErrorsAsString() to help debugging forms
+ * allowed setting different options for RepeatedType fields (like the label)
+
+### HttpFoundation
+
+ * added a generic access to the PHP built-in filter mechanism: ParameterBag::filter()
+ * made FileBinaryMimeTypeGuesser command configurable
+ * added Request::getUser() and Request::getPassword()
+ * added support for the PATCH method in Request
+ * removed the ContentTypeMimeTypeGuesser class as it is deprecated and never used on PHP 5.3
+ * added ResponseHeaderBag::makeDisposition() (implements RFC 6266)
+ * made mimetype to extension conversion configurable
+
+### HttpKernel
+
+ * added a File-based profiler storage
+ * added a MongoDB-based profiler storage
+
+### Translation
+
+ * added support for more than one fallback locale
+ * added support for translations in ResourceBundles
+ * added support for extracting translation messages from templates (Twig and PHP)
+ * added dumpers for translation catalogs
+ * added support for QT translations
+
+### Validator
+
+ * improved the ImageValidator with min width, max width, min height, and max height constraints
+ * added support for MIME with wildcard in FileValidator
diff --git a/src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php b/src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php
@@ -50,7 +50,7 @@ public function warmUp($cacheDir)
     {
         foreach ($this->registry->getEntityManagers() as $em) {
             // we need the directory no matter the proxy cache generation strategy
-            if (!file_exists($proxyCacheDir = $em->getConfiguration()->getProxyDir())) {
+            if (!is_dir($proxyCacheDir = $em->getConfiguration()->getProxyDir())) {
                 if (false === @mkdir($proxyCacheDir, 0777, true)) {
                     throw new \RuntimeException(sprintf('Unable to create the Doctrine Proxy directory "%s".', dirname($proxyCacheDir)));
                 }

diff --git a/src/Symfony/Bridge/Doctrine/Mapping/Driver/XmlDriver.php b/src/Symfony/Bridge/Doctrine/Mapping/Driver/XmlDriver.php
@@ -123,7 +123,7 @@ protected function initialize()
         $this->_classCache = array();
         if (null !== $this->_globalBasename) {
             foreach ($this->_paths as $path) {
-                if (file_exists($file = $path.'/'.$this->_globalBasename.$this->_fileExtension)) {
+                if (is_file($file = $path.'/'.$this->_globalBasename.$this->_fileExtension)) {
                     $this->_classCache = array_merge($this->_classCache, $this->_loadMappingFile($file));
                 }
             }
@@ -135,7 +135,7 @@ protected function _findMappingFile($className)
         $defaultFileName = str_replace('\\', '.', $className).$this->_fileExtension;
         foreach ($this->_paths as $path) {
             if (!isset($this->_prefixes[$path])) {
-                if (file_exists($path.DIRECTORY_SEPARATOR.$defaultFileName)) {
+                if (is_file($path.DIRECTORY_SEPARATOR.$defaultFileName)) {
                     return $path.DIRECTORY_SEPARATOR.$defaultFileName;
                 }
 
@@ -149,7 +149,7 @@ protected function _findMappingFile($className)
             }
 
             $filename = $path.'/'.strtr(substr($className, strlen($prefix)+1), '\\', '.').$this->_fileExtension;
-            if (file_exists($filename)) {
+            if (is_file($filename)) {
                 return $filename;
             }
 

diff --git a/src/Symfony/Bridge/Doctrine/Mapping/Driver/YamlDriver.php b/src/Symfony/Bridge/Doctrine/Mapping/Driver/YamlDriver.php
@@ -123,7 +123,7 @@ protected function initialize()
         $this->_classCache = array();
         if (null !== $this->_globalBasename) {
             foreach ($this->_paths as $path) {
-                if (file_exists($file = $path.'/'.$this->_globalBasename.$this->_fileExtension)) {
+                if (is_file($file = $path.'/'.$this->_globalBasename.$this->_fileExtension)) {
                     $this->_classCache = array_merge($this->_classCache, $this->_loadMappingFile($file));
                 }
             }
@@ -135,7 +135,7 @@ protected function _findMappingFile($className)
         $defaultFileName = str_replace('\\', '.', $className).$this->_fileExtension;
         foreach ($this->_paths as $path) {
             if (!isset($this->_prefixes[$path])) {
-                if (file_exists($path.DIRECTORY_SEPARATOR.$defaultFileName)) {
+                if (is_file($path.DIRECTORY_SEPARATOR.$defaultFileName)) {
                     return $path.DIRECTORY_SEPARATOR.$defaultFileName;
                 }
 
@@ -149,7 +149,7 @@ protected function _findMappingFile($className)
             }
 
             $filename = $path.'/'.strtr(substr($className, strlen($prefix)+1), '\\', '.').$this->_fileExtension;
-            if (file_exists($filename)) {
+            if (is_file($filename)) {
                 return $filename;
             }
 

diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
@@ -54,7 +54,11 @@ public function isValid($entity, Constraint $constraint)
             throw new ConstraintDefinitionException("At least one field has to be specified.");
         }
 
-        $em = $this->registry->getEntityManager($constraint->em);
+        if ($constraint->em) {
+            $em = $this->registry->getEntityManager($constraint->em);
+        } else {
+            $em = $this->registry->getEntityManagerForClass(get_class($entity));
+        }
 
         $className = $this->context->getCurrentClass();
         $class = $em->getClassMetadata($className);

diff --git a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
@@ -14,6 +14,7 @@
 use Symfony\Bridge\Twig\TokenParser\TransTokenParser;
 use Symfony\Bridge\Twig\TokenParser\TransChoiceTokenParser;
 use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Bridge\Twig\NodeVisitor\TranslationNodeVisitor;
 
 /**
  * Provides integration of the Translation component with Twig.
@@ -23,10 +24,12 @@
 class TranslationExtension extends \Twig_Extension
 {
     private $translator;
+    private $translationNodeVisitor;
 
     public function __construct(TranslatorInterface $translator)
     {
         $this->translator = $translator;
+        $this->translationNodeVisitor = new TranslationNodeVisitor();
     }
 
     public function getTranslator()
@@ -63,6 +66,19 @@ public function getTokenParsers()
         );
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getNodeVisitors()
+    {
+        return array($this->translationNodeVisitor);
+    }
+
+    public function getTranslationNodeVisitor()
+    {
+        return $this->translationNodeVisitor;
+    }
+
     public function trans($message, array $arguments = array(), $domain = "messages", $locale = null)
     {
         return $this->translator->trans($message, $arguments, $domain, $locale);

diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
@@ -0,0 +1,88 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Twig\NodeVisitor;
+
+use Symfony\Bridge\Twig\Node\TransNode;
+
+/**
+ * TranslationNodeVisitor extracts translation messages.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class TranslationNodeVisitor implements \Twig_NodeVisitorInterface
+{
+    private $enabled = false;
+    private $messages = array();
+
+    public function enable()
+    {
+        $this->enabled = true;
+        $this->messages = array();
+    }
+
+    public function disable()
+    {
+        $this->enabled = false;
+        $this->messages = array();
+    }
+
+    public function getMessages()
+    {
+        return $this->messages;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function enterNode(\Twig_NodeInterface $node, \Twig_Environment $env)
+    {
+        if (!$this->enabled) {
+            return $node;
+        }
+
+        if (
+            $node instanceof \Twig_Node_Expression_Filter &&
+            'trans' === $node->getNode('filter')->getAttribute('value') &&
+            $node->getNode('node') instanceof \Twig_Node_Expression_Constant
+        ) {
+            // extract constant nodes with a trans filter
+            $this->messages[] = array(
+                $node->getNode('node')->getAttribute('value'),
+                $node->getNode('arguments')->hasNode(1) ? $node->getNode('arguments')->getNode(1)->getAttribute('value') : null,
+            );
+        } elseif ($node instanceof TransNode) {
+            // extract trans nodes
+            $this->messages[] = array(
+                $node->getNode('body')->getAttribute('data'),
+                $node->getNode('domain')->getAttribute('value'),
+            );
+        }
+
+        return $node;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function leaveNode(\Twig_NodeInterface $node, \Twig_Environment $env)
+    {
+        return $node;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getPriority()
+    {
+        return 255;
+    }
+}
diff --git a/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php b/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php
@@ -0,0 +1,85 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Twig\Translation;
+
+use Symfony\Component\Finder\Finder;
+use Symfony\Component\Translation\Extractor\ExtractorInterface;
+use Symfony\Component\Translation\MessageCatalogue;
+
+/**
+ * TwigExtractor extracts translation messages from a twig template.
+ *
+ * @author Michel Salib <michelsalib@hotmail.com>
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class TwigExtractor implements ExtractorInterface
+{
+    /**
+     * Default domain for found messages.
+     *
+     * @var string
+     */
+    private $defaultDomain = 'messages';
+
+    /**
+     * Prefix for found message.
+     *
+     * @var string
+     */
+    private $prefix = '';
+
+    /**
+     * The twig environment.
+     * @var \Twig_Environment
+     */
+    private $twig;
+
+    public function __construct(\Twig_Environment $twig)
+    {
+        $this->twig = $twig;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function extract($directory, MessageCatalogue $catalogue)
+    {
+        // load any existing translation files
+        $finder = new Finder();
+        $files = $finder->files()->name('*.twig')->in($directory);
+        foreach ($files as $file) {
+            $this->extractTemplate(file_get_contents($file->getPathname()), $catalogue);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setPrefix($prefix)
+    {
+        $this->prefix = $prefix;
+    }
+
+    protected function extractTemplate($template, MessageCatalogue $catalogue)
+    {
+        $visitor = $this->twig->getExtension('translator')->getTranslationNodeVisitor();
+        $visitor->enable();
+
+        $this->twig->parse($this->twig->tokenize($template));
+
+        foreach ($visitor->getMessages() as $message) {
+            $catalogue->set($message[0], $this->prefix.$message[0], $message[1] ? $message[1] : $this->defaultDomain);
+        }
+
+        $visitor->disable();
+    }
+}
diff --git a/src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php
@@ -65,7 +65,7 @@ protected function loadMappingInformation(array $objectManager, ContainerBuilder
             $mappingConfig['dir'] = $container->getParameterBag()->resolveValue($mappingConfig['dir']);
             // a bundle configuration is detected by realizing that the specified dir is not absolute and existing
             if (!isset($mappingConfig['is_bundle'])) {
-                $mappingConfig['is_bundle'] = !file_exists($mappingConfig['dir']);
+                $mappingConfig['is_bundle'] = !is_dir($mappingConfig['dir']);
             }
 
             if ($mappingConfig['is_bundle']) {
@@ -234,7 +234,7 @@ protected function assertValidMappingConfiguration(array $mappingConfig, $object
             throw new \InvalidArgumentException(sprintf('Mapping definitions for Doctrine manager "%s" require at least the "type", "dir" and "prefix" options.', $objectManagerName));
         }
 
-        if (!file_exists($mappingConfig['dir'])) {
+        if (!is_dir($mappingConfig['dir'])) {
             throw new \InvalidArgumentException(sprintf('Specified non-existing directory "%s" as Doctrine mapping source.', $mappingConfig['dir']));
         }
 
@@ -263,6 +263,7 @@ protected function detectMetadataDriver($dir, ContainerBuilder $container)
         while (!is_dir($resource)) {
             $resource = dirname($resource);
         }
+
         $container->addResource(new FileResource($resource));
 
         $extension = $this->getMappingResourceExtension();