Uppgrade de symfony et des bundles associés.

app/Resources/FOSUserBundle/translations/FOSUserBundle.fr.yml

@@ -0,0 +1,101 @@
+# Group
+group:
+    edit:
+        submit: Mettre à jour le groupe
+    show:
+        name: Nom du groupe
+    new:
+        submit: Créer le groupe
+    flash:
+        updated: Le groupe a été mis à jour
+        created: Le groupe a été créé
+        deleted: Le groupe a été supprimé
+
+# Security
+security:
+    login:
+        username: "Nom d'utilisateur:"
+        password: "Mot de passe:"
+        remember_me: Se souvenir de moi
+        submit: Connexion
+
+# Profile
+profile:
+    show:
+        username: Nom d'utilisateur
+        email: Adresse e-mail
+    edit:
+        submit: Mettre à jour
+    flash:
+        updated: Le profil a été mis à jour
+
+# Password change
+change_password:
+    submit: Modifier le mot de passe
+    flash:
+        success: Le mot de passe a été modifié
+
+# Registration
+registration:
+    check_email: Un e-mail a été envoyé à l'adresse %email%. Veuillez suivre les instructions qui vous y sont indiquées.
+    confirmed: Félicitations %username%, votre compte est maintenant activé.
+    back: Retour à la page d'origine.
+    submit: Enregistrer
+    flash:
+        user_created: L'utilisateur a été créé avec succès
+    email: |
+        Bienvenue %username% !
+        Bonjour %username% !
+
+        Pour valider votre compte utilisateur, merci de vous rendre sur %confirmationUrl%
+
+        Cordialement,
+        L'équipe.
+
+# Password resetting
+resetting:
+    password_already_requested: Un nouveau mot de passe a déjà été demandé pour cet utilisateur dans les dernières 24 heures.
+    check_email: Un e-mail a été envoyé. Veuillez suivre les instructions qui vous y sont indiquées.
+    request:
+        invalid_username: Le nom d'utilisateur ou l'adresse e-mail "%username%" n'existe pas.
+        username: "Nom d'utilisateur ou adresse e-mail:"
+        submit: Réinitialiser le mot de passe
+    reset:
+        submit: Modifier le mot de passe
+    flash:
+        success: Le mot de passe a été réinitialisé avec succès
+    email: |
+        Mot de passe pour %username%
+        Bonjour %username% !
+
+        Pour réinitialiser votre mot de passe, merci de vous rendre sur %confirmationUrl%
+
+        Cordialement,
+        L'équipe.
+
+# Global strings
+layout:
+    logout: Déconnexion
+    login: Connexion
+    register: Enregistrer
+    logged_in_as: Connecté en tant que %username%
+
+# Form field labels
+fos_user_group_form_name: "Nom du groupe:"
+
+fos_user_profile_form_username:             "Nom d'utilisateur:"
+fos_user_profile_form_email:                "Adresse e-mail:"
+fos_user_profile_form_plainPassword_first:  "Mot de passe:"
+fos_user_profile_form_plainPassword_second: "Vérification:"
+
+fos_user_registration_form_username:             "Nom d'utilisateur:"
+fos_user_registration_form_email:                "Adresse e-mail:"
+fos_user_registration_form_plainPassword_first:  "Mot de passe:"
+fos_user_registration_form_plainPassword_second: "Vérification:"
+
+fos_user_resetting_form_new_first:  "Nouveau mot de passe:"
+fos_user_resetting_form_new_second: "Vérification:"
+
+fos_user_change_password_form_new_first:    "Nouveau mot de passe:"
+fos_user_change_password_form_new_second:   "Vérification:"
+fos_user_change_password_form_current:  "Mot de passe actuel:"

app/Resources/FOSUserBundle/views/Resetting/checkEmail.html.twig

@@ -2,6 +2,6 @@
 
 {% block fos_user_content %}
 <p>
-{{ 'resetting.check_email'|trans({'%email%': user.email}, 'FOSUserBundle') }}
+{{ 'resetting.check_email'|trans({'%email%': ''}, 'FOSUserBundle') }}
 </p>
 {% endblock %}

app/bootstrap.php.cache

@@ -456,7 +456,7 @@ abstract class Kernel implements KernelInterface
     protected $startTime;
     protected $classes;
 
-    const VERSION = '2.0.1';
+    const VERSION = '2.0.8';
 
     
     public function __construct($environment, $debug)
@@ -787,7 +787,7 @@ abstract class Kernel implements KernelInterface
         $this->container = new $class();
         $this->container->set('kernel', $this);
 
-        if (!$fresh) {
+        if (!$fresh && $this->container->has('cache_warmer')) {
             $this->container->get('cache_warmer')->warmUp($this->container->getParameter('kernel.cache_dir'));
         }
     }
@@ -835,7 +835,7 @@ abstract class Kernel implements KernelInterface
         foreach (array('cache' => $this->getCacheDir(), 'logs' => $this->getLogDir()) as $name => $dir) {
             if (!is_dir($dir)) {
                 if (false === @mkdir($dir, 0777, true)) {
-                    throw new \RuntimeException(sprintf("Unable to create the %s directory (%s)\n", $name, dirname($dir)));
+                    throw new \RuntimeException(sprintf("Unable to create the %s directory (%s)\n", $name, $dir));
                 }
             } elseif (!is_writable($dir)) {
                 throw new \RuntimeException(sprintf("Unable to write in the %s directory (%s)\n", $name, $dir));
@@ -992,7 +992,7 @@ class ClassCollectionLoader
         $files = array();
         $content = '';
         foreach ($classes as $class) {
-            if (!class_exists($class) && !interface_exists($class)) {
+            if (!class_exists($class) && !interface_exists($class) && (!function_exists('trait_exists') || !trait_exists($class))) {
                 throw new \InvalidArgumentException(sprintf('Unable to load class "%s"', $class));
             }
 

app/config/security.yml

@@ -1,6 +1,13 @@
 imports:
     - { resource: "@MuzichCoreBundle/Resources/config/security.yml" }
 
+security:
+    encoders:
+        'FOS\UserBundle\Model\UserInterface':
+            algorithm: sha512
+            encode_as_base64: false
+            iterations: 10
+
 #security:
 #    encoders:
 #        Symfony\Component\Security\Core\User\User: plaintext

deps

@@ -1,34 +1,34 @@
 [symfony]
     git=http://github.com/symfony/symfony.git
-    version=v2.0.1
+    version=v2.0.8
 
 [twig]
     git=http://github.com/fabpot/Twig.git
-    version=v1.1.2
+    version=v1.4.0
 
 [monolog]
     git=http://github.com/Seldaek/monolog.git
-    version=1.0.1
+    version=1.0.2
 
 [doctrine-common]
     git=http://github.com/doctrine/common.git
-    version=2.1.1
+    version=2.1.4
 
 [doctrine-dbal]
     git=http://github.com/doctrine/dbal.git
-    version=2.1.1
+    version=2.1.5
 
 [doctrine]
     git=http://github.com/doctrine/doctrine2.git
-    version=2.1.1
+    version=2.1.5
 
 [swiftmailer]
     git=http://github.com/swiftmailer/swiftmailer.git
-    version=v4.1.1
+    version=v4.1.4
 
 [assetic]
     git=http://github.com/kriswallsmith/assetic.git
-    version=v1.0.1
+    version=v1.0.2
 
 [twig-extensions]
     git=http://github.com/fabpot/Twig-extensions.git
@@ -40,14 +40,17 @@
 [SensioFrameworkExtraBundle]
     git=http://github.com/sensio/SensioFrameworkExtraBundle.git
     target=/bundles/Sensio/Bundle/FrameworkExtraBundle
+    version=origin/2.0
 
 [JMSSecurityExtraBundle]
     git=http://github.com/schmittjoh/JMSSecurityExtraBundle.git
     target=/bundles/JMS/SecurityExtraBundle
+    version=origin/1.0.x
 
 [SensioDistributionBundle]
     git=http://github.com/sensio/SensioDistributionBundle.git
     target=/bundles/Sensio/Bundle/DistributionBundle
+    version=origin/2.0
 
 [SensioGeneratorBundle]
     git=http://github.com/sensio/SensioGeneratorBundle.git
@@ -56,7 +59,6 @@
 [AsseticBundle]
     git=http://github.com/symfony/AsseticBundle.git
     target=/bundles/Symfony/Bundle/AsseticBundle
-    version=v1.0.0
 
 [FOSUserBundle]
     git=git://github.com/FriendsOfSymfony/FOSUserBundle.git

deps.lock

@@ -1,15 +1,14 @@
-symfony 7cb402d806a9615cf8bcafcfd049da00914b45f8
-twig 396435ecd05556adb0a8bd05b14641cb4f8a8aa5
-monolog 303b8a83c87d5c6d749926cf02620465a5dcd0f2
-doctrine-common 174111c8d245d560e1af4c7455b730347f85686d
-doctrine-dbal 54f474b3c321676ceadbe4288396902405d87756
-doctrine 05d12e20be58ab4d5fa403c5bd6ac06d1fce97e5
-swiftmailer 1f273a7cd466a2dd82e59431dd5ce15f36996688
-assetic 3333d371c4511abcdec7bad86e15ac2be3b10f03
-twig-extensions eba4f5d572bec05c72a47bbd73ba0a3330cf8f54
+symfony 5b4e6190c4420524e4dcaf51213c4ad78f646528
+twig 0b7d6dfa0cf0dfb6a3c5745b6434ebd6ea32e90e
+monolog b704c49a3051536f67f2d39f13568f74615b9922
+doctrine-common b886898821288d305862ee9c567cc5b5cbb4c0dc
+doctrine-dbal ae358bd94ec09d7d3ad92ca7820e67825ad9e5f4
+doctrine da0e3439aba4c8bf5e8a6ee4ccee5ce2624be8d1
+swiftmailer eb0ecaa4243efc46e0f54d87c6454e49aa4b62dd
+assetic f829ad23d23c87480151a21faad49fefe7c09e5d
+twig-extensions d75a453b4e1ad48216cc4803ba9095855f130774
 metadata 8717ad2a5689480765d9ffafe925cd8a2457e582
-SensioFrameworkExtraBundle 9b9194a47effc66b08d44ae110b982352119ca17
-JMSSecurityExtraBundle facedd50988b311f778288ea3b5e070591936f30
-SensioDistributionBundle 029151792beac272548fe9df183e15b9be521870
-SensioGeneratorBundle 52038c005d565a1bd4986dcdef207ed9f1246b32
-AsseticBundle 9c1b7269a4517d1ae94af2dc0d6d6fc4b31e6c10
+SensioFrameworkExtraBundle 1c7e92f466d11f83130b0c1271f44d067a2c3b31
+JMSSecurityExtraBundle b8b7eb294ed83d83ca7260ac018e701f08003538
+SensioDistributionBundle 20b66a408084ad8752f98e50f10533f5245310bf
+SensioGeneratorBundle 87fe88c4c8dc09cb197ba4b2d6d5b834e2c64980

deps~

@@ -1,34 +1,34 @@
 [symfony]
     git=http://github.com/symfony/symfony.git
-    version=v2.0.1
+    version=v2.0.8
 
 [twig]
     git=http://github.com/fabpot/Twig.git
-    version=v1.1.2
+    version=v1.4.0
 
 [monolog]
     git=http://github.com/Seldaek/monolog.git
-    version=1.0.1
+    version=1.0.2
 
 [doctrine-common]
     git=http://github.com/doctrine/common.git
-    version=2.1.1
+    version=2.1.4
 
 [doctrine-dbal]
     git=http://github.com/doctrine/dbal.git
-    version=2.1.1
+    version=2.1.5
 
 [doctrine]
     git=http://github.com/doctrine/doctrine2.git
-    version=2.1.1
+    version=2.1.5
 
 [swiftmailer]
     git=http://github.com/swiftmailer/swiftmailer.git
-    version=v4.1.1
+    version=v4.1.4
 
 [assetic]
     git=http://github.com/kriswallsmith/assetic.git
-    version=v1.0.1
+    version=v1.0.2
 
 [twig-extensions]
     git=http://github.com/fabpot/Twig-extensions.git
@@ -40,14 +40,17 @@
 [SensioFrameworkExtraBundle]
     git=http://github.com/sensio/SensioFrameworkExtraBundle.git
     target=/bundles/Sensio/Bundle/FrameworkExtraBundle
+    version=origin/2.0
 
 [JMSSecurityExtraBundle]
     git=http://github.com/schmittjoh/JMSSecurityExtraBundle.git
     target=/bundles/JMS/SecurityExtraBundle
+    version=origin/1.0.x
 
 [SensioDistributionBundle]
     git=http://github.com/sensio/SensioDistributionBundle.git
     target=/bundles/Sensio/Bundle/DistributionBundle
+    version=origin/2.0
 
 [SensioGeneratorBundle]
     git=http://github.com/sensio/SensioGeneratorBundle.git
@@ -56,8 +59,15 @@
 [AsseticBundle]
     git=http://github.com/symfony/AsseticBundle.git
     target=/bundles/Symfony/Bundle/AsseticBundle
-    version=v1.0.0
+    version=v1.0.1
 
 [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

src/Muzich/CoreBundle/Tests/Controller/IndexControllerTest.php

@@ -183,7 +183,6 @@ class IndexControllerTest extends FunctionalTest
     $this->isResponseRedirection();
     $this->followRedirection();
     $this->isResponseSuccess();
-    $this->exist('html:contains("'.$bux->getEmail().'")');
     
     // On se rend sur le lien envoyé dans le mail
     $this->crawler = $this->client->request('GET', $url);

src/Muzich/UserBundle/Controller/ResettingController.php

@@ -26,6 +26,26 @@ class ResettingController extends BaseResettingController
       return $this->container->get('router')->generate('my_account');
   }
   
+  /**
+   * Tell the user to check his email provider
+   * Réécriture de la fonction, il manque 'user' pour le template
+   */
+  public function checkEmailAction()
+  {
+    $session = $this->container->get('session');
+    $email = $session->get(static::SESSION_EMAIL);
+    $session->remove(static::SESSION_EMAIL);
+
+    if (empty($email)) {
+      // the user does not come from the sendEmail action
+      return new RedirectResponse($this->container->get('router')->generate('fos_user_resetting_request'));
+    }
+
+    return $this->container->get('templating')->renderResponse('FOSUserBundle:Resetting:checkEmail.html.'.$this->getEngine(), array(
+      'email' => $email, 'user' => $this->container->get('security.context')->getToken()->getUser()
+    ));
+  }
+  
 }
 
 ?>

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

@@ -43,7 +43,7 @@ class LoadUserData extends AbstractFixture implements OrderedFixtureInterface, C
     $user->setUsername($username);
     $user->setEmail($email);
     $user->setSuperAdmin($superadmin);
-    $user->setAlgorithm('sha512');
+    //$user->setAlgorithm('sha512');
     
     $user->setPlainPassword($password_raw);
     $user->setEnabled($enabled);

src/Muzich/UserBundle/Entity/UserManager.php

@@ -6,184 +6,30 @@
 
 namespace Muzich\UserBundle\Entity;
 
-use Doctrine\ORM\EntityManager;
-use FOS\UserBundle\Model\UserInterface;
-use FOS\UserBundle\Model\UserManager as BaseUserManager;
-use FOS\UserBundle\Util\CanonicalizerInterface;
 use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
-use Symfony\Component\Validator\Constraint;
+use FOS\UserBundle\Util\CanonicalizerInterface;
+use Doctrine\ORM\EntityManager;
+use FOS\UserBundle\Entity\UserManager as UserManagerBase;
 
-class UserManager extends BaseUserManager
+/**
+ */
+class UserManager extends UserManagerBase
 {
-    protected $em;
-    protected $class;
-    protected $repository;
-
-    /**
-     * Constructor.
-     *
-     * @param EncoderFactoryInterface $encoderFactory
-     * @param string                  $algorithm
-     * @param CanonicalizerInterface  $usernameCanonicalizer
-     * @param CanonicalizerInterface  $emailCanonicalizer
-     * @param EntityManager           $em
-     * @param string                  $class
-     */
-    public function __construct(EncoderFactoryInterface $encoderFactory, $algorithm, CanonicalizerInterface $usernameCanonicalizer, CanonicalizerInterface $emailCanonicalizer, EntityManager $em, $class)
-    {
-        parent::__construct($encoderFactory, $algorithm, $usernameCanonicalizer, $emailCanonicalizer);
-        
-        $this->em = $em;
-        $this->repository = $em->getRepository($class);
-
-        $metadata = $em->getClassMetadata($class);
-        $this->class = $metadata->name;
-
-        // Slug stuff
-        $evm = new \Doctrine\Common\EventManager();
-        // ORM and ODM
-        $sluggableListener = new \Gedmo\Sluggable\SluggableListener();
-        $evm->addEventSubscriber($sluggableListener);
-        // now this event manager should be passed to entity manager constructor
-        $this->em->getEventManager()->addEventSubscriber($sluggableListener);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function deleteUser(UserInterface $user)
-    {
-        $this->em->remove($user);
-        $this->em->flush();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getClass()
-    {
-        return $this->class;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function findUserBy(array $criteria)
-    {
-        return $this->repository->findOneBy($criteria);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function findUsers()
-    {
-        return $this->repository->findAll();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function reloadUser(UserInterface $user)
-    {
-        $this->em->refresh($user);
-    }
-
-    /**
-     * Updates a user.
-     *
-     * @param UserInterface $user
-     * @param Boolean $andFlush Whether to flush the changes (default true)
-     */
-    public function updateUser(UserInterface $user, $andFlush = true)
-    {
-        $this->updateCanonicalFields($user);
-        $this->updatePassword($user);
-
-        $this->em->persist($user);
-        if ($andFlush) {
-            $this->em->flush();
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function validateUnique(UserInterface $value, Constraint $constraint)
-    {
-        // Since we probably want to validate the canonical fields,
-        // we'd better make sure we have them.
-        $this->updateCanonicalFields($value);
-
-        $fields = array_map('trim', explode(',', $constraint->property));
-        $users = $this->findConflictualUsers($value, $fields);
-
-        // there is no conflictual user
-        if (empty($users)) {
-            return true;
-        }
-
-        // there is no conflictual user which is not the same as the value
-        if ($this->anyIsUser($value, $users)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Indicates whether the given user and all compared objects correspond to the same record.
-     *
-     * @param UserInterface $user
-     * @param array $comparisons
-     * @return Boolean
-     */
-    protected function anyIsUser($user, array $comparisons)
-    {
-        foreach ($comparisons as $comparison) {
-            if (!$user->isUser($comparison)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Gets conflictual users for the given user and constraint.
-     *
-     * @param UserInterface $value
-     * @param array $fields
-     * @return array
-     */
-    protected function findConflictualUsers($value, array $fields)
-    {
-        return $this->repository->findBy($this->getCriteria($value, $fields));
-    }
-
-    /**
-     * Gets the criteria used to find conflictual entities.
-     *
-     * @param UserInterface $value
-     * @param array $constraint
-     * @return array
-     */
-    protected function getCriteria($value, array $fields)
-    {
-        $classMetadata = $this->em->getClassMetadata($this->class);
-
-        $criteria = array();
-        foreach ($fields as $field) {
-            if (!$classMetadata->hasField($field)) {
-                throw new \InvalidArgumentException(sprintf('The "%s" class metadata does not have any "%s" field or association mapping.', $this->class, $field));
-            }
-
-            $criteria[$field] = $classMetadata->getFieldValue($value, $field);
-        }
-
-        return $criteria;
-    }
-}
-
-
-?>
+  /**
+   * Constructor.
+   */
+  public function __construct(EncoderFactoryInterface $encoderFactory, CanonicalizerInterface $usernameCanonicalizer, CanonicalizerInterface $emailCanonicalizer, EntityManager $em, $class)
+  {
+    parent::__construct($encoderFactory, $usernameCanonicalizer, $emailCanonicalizer, $em, $class);
+    
+    // Slug stuff
+    $evm = new \Doctrine\Common\EventManager();
+    // ORM and ODM
+    $sluggableListener = new \Gedmo\Sluggable\SluggableListener();
+    $evm->addEventSubscriber($sluggableListener);
+    // now this event manager should be passed to entity manager constructor
+
+    $this->em->getEventManager()->addEventSubscriber($sluggableListener);
+  }
+
+}

vendor/assetic/CHANGELOG

@@ -1,3 +1,12 @@
+1.0.2 (August 26, 2011)
+-----------------------
+
+ * Twig 1.2 compatibility
+ * Fixed filtering of large LessCSS assets
+ * Fixed escaping of commands on Windows
+ * Misc fixes to Compass filter
+ * Removed default CssEmbed charset
+
 1.0.1 (July 15, 2011)
 ---------------------
 

vendor/assetic/src/Assetic/Extension/Twig/TwigFormulaLoader.php

@@ -61,7 +61,10 @@ class TwigFormulaLoader implements FormulaLoaderInterface
                 ),
             );
         } elseif ($node instanceof \Twig_Node_Expression_Function) {
-            $name = $node->getNode('name')->getAttribute('name');
+            $name = version_compare(\Twig_Environment::VERSION, '1.2.0-DEV', '<')
+                ? $node->getNode('name')->getAttribute('name')
+                : $node->getAttribute('name');
+
             if ($this->twig->getFunction($name) instanceof AsseticFilterFunction) {
                 $arguments = array();
                 foreach ($node->getNode('arguments') as $argument) {

vendor/assetic/src/Assetic/Filter/CompassFilter.php

@@ -32,7 +32,6 @@ class CompassFilter implements FilterInterface
     private $noCache;
 
     // compass options
-    private $config;
     private $force;
     private $style;
     private $quiet;
@@ -227,7 +226,7 @@ class CompassFilter implements FilterInterface
         if (count($optionsConfig)) {
             $config = array();
             foreach ($this->plugins as $plugin) {
-                $config[] = sprintf("require '%s'", addcslahes($plugin, '\\'));
+                $config[] = sprintf("require '%s'", addcslashes($plugin, '\\'));
             }
             foreach ($optionsConfig as $name => $value) {
                 if (!is_array($value)) {
@@ -237,13 +236,9 @@ class CompassFilter implements FilterInterface
                 }
             }
 
-            $config = implode("\n", $config)."\n";
-            $this->config = tempnam($tempDir, 'assetic_compass');
-            file_put_contents($this->config, $config);
-        }
-
-        if ($this->config) {
-            $pb->add('--config')->add($this->config);
+            $configFile = tempnam($tempDir, 'assetic_compass');
+            file_put_contents($configFile, implode("\n", $config)."\n");
+            $pb->add('--config')->add($configFile);
         }
 
         $pb->add('--sass-dir')->add('')->add('--css-dir')->add('');
@@ -276,18 +271,19 @@ class CompassFilter implements FilterInterface
 
         if (0 < $code) {
             unlink($input);
-            if (is_file($this->config)) {
-                unlink($this->config);
+            if (isset($configFile)) {
+                unlink($configFile);
             }
-            throw new \RuntimeException($proc->getErrorOutput());
+
+            throw new \RuntimeException($proc->getErrorOutput() ?: $proc->getOutput());
         }
 
         $asset->setContent(file_get_contents($output));
 
         unlink($input);
         unlink($output);
-        if (is_file($this->config)) {
-            unlink($this->config);
+        if (isset($configFile)) {
+            unlink($configFile);
         }
     }
 

vendor/assetic/src/Assetic/Filter/CssEmbedFilter.php

@@ -24,7 +24,7 @@ class CssEmbedFilter implements FilterInterface
 {
     private $jarPath;
     private $javaPath;
-    private $charset = 'utf-8';
+    private $charset;
     private $mhtml; // Enable MHTML mode.
     private $mhtmlRoot; // Use <root> as the MHTML root for the file.
     private $root; // Prepends <root> to all relative URLs.

vendor/assetic/src/Assetic/Filter/LessFilter.php

@@ -56,7 +56,6 @@ new(less.Parser)(%s).parse(%s, function(e, tree) {
 
     try {
         sys.print(tree.toCSS(%s));
-        process.exit(0);
     } catch (e) {
         less.writeError(e);
         process.exit(3);

vendor/assetic/src/Assetic/Filter/Yui/BaseCompressorFilter.php

@@ -64,8 +64,6 @@ abstract class BaseCompressorFilter implements FilterInterface
             ->add($this->javaPath)
             ->add('-jar')
             ->add($this->jarPath)
-            ->add('--type')
-            ->add($type)
         ;
 
         foreach ($options as $option) {
@@ -80,18 +78,31 @@ abstract class BaseCompressorFilter implements FilterInterface
             $pb->add('--line-break')->add($this->lineBreak);
         }
 
-        $input = tempnam(sys_get_temp_dir(), 'assetic_yui_compressor');
+        // input and output files
+        $tempDir = realpath(sys_get_temp_dir());
+        $hash = substr(sha1(time().rand(11111, 99999)), 0, 7);
+        $input = $tempDir.DIRECTORY_SEPARATOR.$hash.'.'.$type;
+        $output = $tempDir.DIRECTORY_SEPARATOR.$hash.'-min.'.$type;
         file_put_contents($input, $content);
-        $pb->add($input);
+        $pb->add('-o')->add($output)->add($input);
 
         $proc = $pb->getProcess();
         $code = $proc->run();
         unlink($input);
 
         if (0 < $code) {
+            if (file_exists($output)) {
+                unlink($output);
+            }
+
             throw new \RuntimeException($proc->getErrorOutput());
+        } elseif (!file_exists($output)) {
+            throw new \RuntimeException('Error creating output file.');
         }
 
-        return $proc->getOutput();
+        $retval = file_get_contents($output);
+        unlink($output);
+
+        return $retval;
     }
 }

vendor/assetic/src/Assetic/Util/Process.php

@@ -189,13 +189,13 @@ class Process
             $this->status = proc_get_status($process);
         }
 
-        proc_close($process);
+        $exitcode = proc_close($process);
 
         if ($this->status['signaled']) {
             throw new \RuntimeException(sprintf('The process stopped because of a "%s" signal.', $this->status['stopsig']));
         }
 
-        return $this->exitcode = $this->status['exitcode'];
+        return $this->exitcode = $this->status['running'] ? $exitcode : $this->status['exitcode'];
     }
 
     /**

vendor/assetic/src/Assetic/Util/ProcessBuilder.php

@@ -18,7 +18,7 @@ namespace Assetic\Util;
  */
 class ProcessBuilder
 {
-    private $parts = array();
+    private $arguments = array();
     private $cwd;
     private $env;
     private $stdin;
@@ -26,9 +26,14 @@ class ProcessBuilder
     private $options = array();
     private $inheritEnv = false;
 
-    public function add($part)
+    /**
+     * Adds an unescaped argument to the command string.
+     *
+     * @param string $argument A command argument
+     */
+    public function add($argument)
     {
-        $this->parts[] = $part;
+        $this->arguments[] = $argument;
 
         return $this;
     }
@@ -81,16 +86,27 @@ class ProcessBuilder
 
     public function getProcess()
     {
-        if (!count($this->parts)) {
-            throw new \LogicException('You must add() command parts before calling getProcess().');
+        if (!count($this->arguments)) {
+            throw new \LogicException('You must add() command arguments before calling getProcess().');
         }
 
-        $parts = $this->parts;
-        $cmd = array_shift($parts);
-        $script = escapeshellcmd($cmd).' '.implode(' ', array_map('escapeshellarg', $parts));
+        $options = $this->options;
 
+        if (defined('PHP_WINDOWS_MAJOR_VERSION')) {
+            $options += array('bypass_shell' => true);
+
+            $args = $this->arguments;
+            $cmd = array_shift($args);
+
+            $script = '"'.$cmd.'"';
+            if ($args) {
+                $script .= ' '.implode(' ', array_map('escapeshellarg', $parts));
+            }
+        } else {
+            $script = implode(' ', array_map('escapeshellarg', $this->arguments));
+        }
         $env = $this->inheritEnv ? ($this->env ?: array()) + $_ENV : $this->env;
 
-        return new Process($script, $this->cwd, $env, $this->stdin, $this->timeout, $this->options);
+        return new Process($script, $this->cwd, $env, $this->stdin, $this->timeout, $options);
     }
 }