uppgrade to 2.1.7 and fix code for upgrade

app/AppKernel.php

@@ -13,24 +13,28 @@ class AppKernel extends Kernel
             new Symfony\Bundle\TwigBundle\TwigBundle(),
             new Symfony\Bundle\MonologBundle\MonologBundle(),
             new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
-            new Symfony\Bundle\DoctrineBundle\DoctrineBundle(),
+            new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
             new Symfony\Bundle\AsseticBundle\AsseticBundle(),
             new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
+            new JMS\AopBundle\JMSAopBundle(),
+            new JMS\DiExtraBundle\JMSDiExtraBundle($this),
+            
             new JMS\SecurityExtraBundle\JMSSecurityExtraBundle(),
             new FOS\UserBundle\FOSUserBundle(),
-            new Symfony\Bundle\DoctrineFixturesBundle\DoctrineFixturesBundle(),
+            new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
             new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
-            new Sonata\jQueryBundle\SonatajQueryBundle(),
-            new Sonata\BluePrintBundle\SonataBluePrintBundle(),
-            new Sonata\AdminBundle\SonataAdminBundle(),
-            new Knp\Bundle\MenuBundle\KnpMenuBundle(),
+            //new Sonata\jQueryBundle\SonatajQueryBundle(),
+            //new Sonata\BluePrintBundle\SonataBluePrintBundle(),
+            //new Sonata\AdminBundle\SonataAdminBundle(),
+            //new Knp\Bundle\MenuBundle\KnpMenuBundle(),
             new Gregwar\ImageBundle\GregwarImageBundle(),
+            
             new Muzich\CoreBundle\MuzichCoreBundle(),
             new Muzich\UserBundle\MuzichUserBundle(),
             new Muzich\IndexBundle\MuzichIndexBundle(),
             new Muzich\HomeBundle\MuzichHomeBundle(),
             new Muzich\MynetworkBundle\MuzichMynetworkBundle(),
-            new Muzich\AdminBundle\MuzichAdminBundle(),
+            //new Muzich\AdminBundle\MuzichAdminBundle(),
             new Muzich\GroupBundle\MuzichGroupBundle(),
             new Muzich\FavoriteBundle\MuzichFavoriteBundle(),
             new Muzich\CommentBundle\MuzichCommentBundle(),

app/Resources/translations/validators.fr.yml

@@ -39,4 +39,8 @@ error:
       
 registration:
   token:
-    error:               Le code saisie pour l'inscription est incorrect ou n'est plus utilisable
+    error:               Le code saisie pour l'inscription est incorrect ou n'est plus utilisable
+    
+group_malchoisis:        Le groupe est mal choisis
+group_invalid:           Le groupe est invalide
+tags_saisinco:           Tags saisis incorrects

app/SymfonyRequirements.php

@@ -0,0 +1,646 @@
+<?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.
+ */
+
+/*
+ * Users of PHP 5.2 should be able to run the requirements checks.
+ * This is why the file and all classes must be compatible with PHP 5.2+
+ * (e.g. not using namespaces and closures).
+ *
+ * ************** CAUTION **************
+ *
+ * DO NOT EDIT THIS FILE as it will be overriden by Composer as part of
+ * the installation/update process. The original file resides in the
+ * SensioDistributionBundle.
+ *
+ * ************** CAUTION **************
+ */
+
+/**
+ * Represents a single PHP requirement, e.g. an installed extension.
+ * It can be a mandatory requirement or an optional recommendation.
+ * There is a special subclass, named PhpIniRequirement, to check a php.ini configuration.
+ *
+ * @author Tobias Schultze <http://tobion.de>
+ */
+class Requirement
+{
+    private $fulfilled;
+    private $testMessage;
+    private $helpText;
+    private $helpHtml;
+    private $optional;
+
+    /**
+     * Constructor that initializes the requirement.
+     *
+     * @param Boolean      $fulfilled     Whether the requirement is fulfilled
+     * @param string       $testMessage   The message for testing the requirement
+     * @param string       $helpHtml      The help text formatted in HTML for resolving the problem
+     * @param string|null  $helpText      The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
+     * @param Boolean      $optional      Whether this is only an optional recommendation not a mandatory requirement
+     */
+    public function __construct($fulfilled, $testMessage, $helpHtml, $helpText = null, $optional = false)
+    {
+        $this->fulfilled = (Boolean) $fulfilled;
+        $this->testMessage = (string) $testMessage;
+        $this->helpHtml = (string) $helpHtml;
+        $this->helpText = null === $helpText ? strip_tags($this->helpHtml) : (string) $helpText;
+        $this->optional = (Boolean) $optional;
+    }
+
+    /**
+     * Returns whether the requirement is fulfilled.
+     *
+     * @return Boolean true if fulfilled, otherwise false
+     */
+    public function isFulfilled()
+    {
+        return $this->fulfilled;
+    }
+
+    /**
+     * Returns the message for testing the requirement.
+     *
+     * @return string The test message
+     */
+    public function getTestMessage()
+    {
+        return $this->testMessage;
+    }
+
+    /**
+     * Returns the help text for resolving the problem
+     *
+     * @return string The help text
+     */
+    public function getHelpText()
+    {
+        return $this->helpText;
+    }
+
+    /**
+     * Returns the help text formatted in HTML.
+     *
+     * @return string The HTML help
+     */
+    public function getHelpHtml()
+    {
+        return $this->helpHtml;
+    }
+
+    /**
+     * Returns whether this is only an optional recommendation and not a mandatory requirement.
+     *
+     * @return Boolean true if optional, false if mandatory
+     */
+    public function isOptional()
+    {
+        return $this->optional;
+    }
+}
+
+/**
+ * Represents a PHP requirement in form of a php.ini configuration.
+ *
+ * @author Tobias Schultze <http://tobion.de>
+ */
+class PhpIniRequirement extends Requirement
+{
+    /**
+     * Constructor that initializes the requirement.
+     *
+     * @param string            $cfgName            The configuration name used for ini_get()
+     * @param Boolean|callback  $evaluation         Either a Boolean indicating whether the configuration should evaluate to true or false,
+                                                    or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
+     * @param Boolean           $approveCfgAbsence  If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
+                                                    This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
+                                                    Example: You require a config to be true but PHP later removes this config and defaults it to true internally.
+     * @param string|null       $testMessage        The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived)
+     * @param string|null       $helpHtml           The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived)
+     * @param string|null       $helpText           The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
+     * @param Boolean           $optional           Whether this is only an optional recommendation not a mandatory requirement
+     */
+    public function __construct($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null, $optional = false)
+    {
+        $cfgValue = ini_get($cfgName);
+
+        if (is_callable($evaluation)) {
+            if (null === $testMessage || null === $helpHtml) {
+                throw new InvalidArgumentException('You must provide the parameters testMessage and helpHtml for a callback evaluation.');
+            }
+
+            $fulfilled = call_user_func($evaluation, $cfgValue);
+        } else {
+            if (null === $testMessage) {
+                $testMessage = sprintf('%s %s be %s in php.ini',
+                    $cfgName,
+                    $optional ? 'should' : 'must',
+                    $evaluation ? 'enabled' : 'disabled'
+                );
+            }
+
+            if (null === $helpHtml) {
+                $helpHtml = sprintf('Set <strong>%s</strong> to <strong>%s</strong> in php.ini<a href="#phpini">*</a>.',
+                    $cfgName,
+                    $evaluation ? 'on' : 'off'
+                );
+            }
+
+            $fulfilled = $evaluation == $cfgValue;
+        }
+
+        parent::__construct($fulfilled || ($approveCfgAbsence && false === $cfgValue), $testMessage, $helpHtml, $helpText, $optional);
+    }
+}
+
+/**
+ * A RequirementCollection represents a set of Requirement instances.
+ *
+ * @author Tobias Schultze <http://tobion.de>
+ */
+class RequirementCollection implements IteratorAggregate
+{
+    private $requirements = array();
+
+    /**
+     * Gets the current RequirementCollection as an Iterator.
+     *
+     * @return Traversable A Traversable interface
+     */
+    public function getIterator()
+    {
+        return new ArrayIterator($this->requirements);
+    }
+
+    /**
+     * Adds a Requirement.
+     *
+     * @param Requirement $requirement A Requirement instance
+     */
+    public function add(Requirement $requirement)
+    {
+        $this->requirements[] = $requirement;
+    }
+
+    /**
+     * Adds a mandatory requirement.
+     *
+     * @param Boolean      $fulfilled     Whether the requirement is fulfilled
+     * @param string       $testMessage   The message for testing the requirement
+     * @param string       $helpHtml      The help text formatted in HTML for resolving the problem
+     * @param string|null  $helpText      The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
+     */
+    public function addRequirement($fulfilled, $testMessage, $helpHtml, $helpText = null)
+    {
+        $this->add(new Requirement($fulfilled, $testMessage, $helpHtml, $helpText, false));
+    }
+
+    /**
+     * Adds an optional recommendation.
+     *
+     * @param Boolean      $fulfilled     Whether the recommendation is fulfilled
+     * @param string       $testMessage   The message for testing the recommendation
+     * @param string       $helpHtml      The help text formatted in HTML for resolving the problem
+     * @param string|null  $helpText      The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
+     */
+    public function addRecommendation($fulfilled, $testMessage, $helpHtml, $helpText = null)
+    {
+        $this->add(new Requirement($fulfilled, $testMessage, $helpHtml, $helpText, true));
+    }
+
+    /**
+     * Adds a mandatory requirement in form of a php.ini configuration.
+     *
+     * @param string            $cfgName            The configuration name used for ini_get()
+     * @param Boolean|callback  $evaluation         Either a Boolean indicating whether the configuration should evaluate to true or false,
+                                                    or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
+     * @param Boolean           $approveCfgAbsence  If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
+                                                    This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
+                                                    Example: You require a config to be true but PHP later removes this config and defaults it to true internally.
+     * @param string            $testMessage        The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived)
+     * @param string            $helpHtml           The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived)
+     * @param string|null       $helpText           The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
+     */
+    public function addPhpIniRequirement($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null)
+    {
+        $this->add(new PhpIniRequirement($cfgName, $evaluation, $approveCfgAbsence, $testMessage, $helpHtml, $helpText, false));
+    }
+
+    /**
+     * Adds an optional recommendation in form of a php.ini configuration.
+     *
+     * @param string            $cfgName            The configuration name used for ini_get()
+     * @param Boolean|callback  $evaluation         Either a Boolean indicating whether the configuration should evaluate to true or false,
+                                                    or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
+     * @param Boolean           $approveCfgAbsence  If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
+                                                    This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
+                                                    Example: You require a config to be true but PHP later removes this config and defaults it to true internally.
+     * @param string            $testMessage        The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived)
+     * @param string            $helpHtml           The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived)
+     * @param string|null       $helpText           The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
+     */
+    public function addPhpIniRecommendation($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null)
+    {
+        $this->add(new PhpIniRequirement($cfgName, $evaluation, $approveCfgAbsence, $testMessage, $helpHtml, $helpText, true));
+    }
+
+    /**
+     * Adds a requirement collection to the current set of requirements.
+     *
+     * @param RequirementCollection $collection A RequirementCollection instance
+     */
+    public function addCollection(RequirementCollection $collection)
+    {
+        $this->requirements = array_merge($this->requirements, $collection->all());
+    }
+
+    /**
+     * Returns both requirements and recommendations.
+     *
+     * @return array Array of Requirement instances
+     */
+    public function all()
+    {
+        return $this->requirements;
+    }
+
+    /**
+     * Returns all mandatory requirements.
+     *
+     * @return array Array of Requirement instances
+     */
+    public function getRequirements()
+    {
+        $array = array();
+        foreach ($this->requirements as $req) {
+            if (!$req->isOptional()) {
+                $array[] = $req;
+            }
+        }
+
+        return $array;
+    }
+
+    /**
+     * Returns the mandatory requirements that were not met.
+     *
+     * @return array Array of Requirement instances
+     */
+    public function getFailedRequirements()
+    {
+        $array = array();
+        foreach ($this->requirements as $req) {
+            if (!$req->isFulfilled() && !$req->isOptional()) {
+                $array[] = $req;
+            }
+        }
+
+        return $array;
+    }
+
+    /**
+     * Returns all optional recommmendations.
+     *
+     * @return array Array of Requirement instances
+     */
+    public function getRecommendations()
+    {
+        $array = array();
+        foreach ($this->requirements as $req) {
+            if ($req->isOptional()) {
+                $array[] = $req;
+            }
+        }
+
+        return $array;
+    }
+
+    /**
+     * Returns the recommendations that were not met.
+     *
+     * @return array Array of Requirement instances
+     */
+    public function getFailedRecommendations()
+    {
+        $array = array();
+        foreach ($this->requirements as $req) {
+            if (!$req->isFulfilled() && $req->isOptional()) {
+                $array[] = $req;
+            }
+        }
+
+        return $array;
+    }
+
+    /**
+     * Returns whether a php.ini configuration is not correct.
+     *
+     * @return Boolean php.ini configuration problem?
+     */
+    public function hasPhpIniConfigIssue()
+    {
+        foreach ($this->requirements as $req) {
+            if (!$req->isFulfilled() && $req instanceof PhpIniRequirement) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the PHP configuration file (php.ini) path.
+     *
+     * @return string|false php.ini file path
+     */
+    public function getPhpIniConfigPath()
+    {
+        return get_cfg_var('cfg_file_path');
+    }
+}
+
+/**
+ * This class specifies all requirements and optional recommendations that
+ * are necessary to run the Symfony Standard Edition.
+ *
+ * @author Tobias Schultze <http://tobion.de>
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+class SymfonyRequirements extends RequirementCollection
+{
+    const REQUIRED_PHP_VERSION = '5.3.3';
+
+    /**
+     * Constructor that initializes the requirements.
+     */
+    public function __construct()
+    {
+        /* mandatory requirements follow */
+
+        $installedPhpVersion = phpversion();
+
+        $this->addRequirement(
+            version_compare($installedPhpVersion, self::REQUIRED_PHP_VERSION, '>='),
+            sprintf('PHP version must be at least %s (%s installed)', self::REQUIRED_PHP_VERSION, $installedPhpVersion),
+            sprintf('You are running PHP version "<strong>%s</strong>", but Symfony needs at least PHP "<strong>%s</strong>" to run.
+                Before using Symfony, upgrade your PHP installation, preferably to the latest version.',
+                $installedPhpVersion, self::REQUIRED_PHP_VERSION),
+            sprintf('Install PHP %s or newer (installed version is %s)', self::REQUIRED_PHP_VERSION, $installedPhpVersion)
+        );
+
+        $this->addRequirement(
+            version_compare($installedPhpVersion, '5.3.16', '!='),
+            'PHP version must not be 5.3.16 as Symfony won\'t work properly with it',
+            'Install PHP 5.3.17 or newer (or downgrade to an earlier PHP version)'
+        );
+
+        $this->addRequirement(
+            is_dir(__DIR__.'/../vendor/composer'),
+            'Vendor libraries must be installed',
+            'Vendor libraries are missing. Install composer following instructions from <a href="http://getcomposer.org/">http://getcomposer.org/</a>. ' .
+                'Then run "<strong>php composer.phar install</strong>" to install them.'
+        );
+
+        $baseDir = basename(__DIR__);
+
+        $this->addRequirement(
+            is_writable(__DIR__.'/cache'),
+            "$baseDir/cache/ directory must be writable",
+            "Change the permissions of the \"<strong>$baseDir/cache/</strong>\" directory so that the web server can write into it."
+        );
+
+        $this->addRequirement(
+            is_writable(__DIR__.'/logs'),
+            "$baseDir/logs/ directory must be writable",
+            "Change the permissions of the \"<strong>$baseDir/logs/</strong>\" directory so that the web server can write into it."
+        );
+
+        $this->addPhpIniRequirement(
+            'date.timezone', true, false,
+            'date.timezone setting must be set',
+            'Set the "<strong>date.timezone</strong>" setting in php.ini<a href="#phpini">*</a> (like Europe/Paris).'
+        );
+
+        if (version_compare($installedPhpVersion, self::REQUIRED_PHP_VERSION, '>=')) {
+            $this->addRequirement(
+                (in_array(date_default_timezone_get(), DateTimeZone::listIdentifiers())),
+                sprintf('Configured default timezone "%s" must be supported by your installation of PHP', date_default_timezone_get()),
+                'Your default timezone is not supported by PHP. Check for typos in your <strong>php.ini</strong> file and have a look at the list of deprecated timezones at <a href="http://php.net/manual/en/timezones.others.php">http://php.net/manual/en/timezones.others.php</a>.'
+            );
+        }
+
+        $this->addRequirement(
+            function_exists('json_encode'),
+            'json_encode() must be available',
+            'Install and enable the <strong>JSON</strong> extension.'
+        );
+
+        $this->addRequirement(
+            function_exists('session_start'),
+            'session_start() must be available',
+            'Install and enable the <strong>session</strong> extension.'
+        );
+
+        $this->addRequirement(
+            function_exists('ctype_alpha'),
+            'ctype_alpha() must be available',
+            'Install and enable the <strong>ctype</strong> extension.'
+        );
+
+        $this->addRequirement(
+            function_exists('token_get_all'),
+            'token_get_all() must be available',
+            'Install and enable the <strong>Tokenizer</strong> extension.'
+        );
+
+        $this->addRequirement(
+            function_exists('simplexml_import_dom'),
+            'simplexml_import_dom() must be available',
+            'Install and enable the <strong>SimpleXML</strong> extension.'
+        );
+
+        if (function_exists('apc_store') && ini_get('apc.enabled')) {
+            $this->addRequirement(
+                version_compare(phpversion('apc'), '3.0.17', '>='),
+                'APC version must be at least 3.0.17',
+                'Upgrade your <strong>APC</strong> extension (3.0.17+).'
+            );
+        }
+
+        $this->addPhpIniRequirement('detect_unicode', false);
+
+        if (extension_loaded('suhosin')) {
+            $this->addPhpIniRequirement(
+                'suhosin.executor.include.whitelist',
+                create_function('$cfgValue', 'return false !== stripos($cfgValue, "phar");'),
+                false,
+                'suhosin.executor.include.whitelist must be configured correctly in php.ini',
+                'Add "<strong>phar</strong>" to <strong>suhosin.executor.include.whitelist</strong> in php.ini<a href="#phpini">*</a>.'
+            );
+        }
+
+        if (extension_loaded('xdebug')) {
+            $this->addPhpIniRequirement(
+                'xdebug.show_exception_trace', false, true
+            );
+
+            $this->addPhpIniRequirement(
+                'xdebug.scream', false, true
+            );
+        }
+
+        $pcreVersion = defined('PCRE_VERSION') ? (float) PCRE_VERSION : null;
+
+        $this->addRequirement(
+            null !== $pcreVersion,
+            'PCRE extension must be available',
+            'Install the <strong>PCRE</strong> extension (version 8.0+).'
+        );
+
+        /* optional recommendations follow */
+
+        $this->addRecommendation(
+            file_get_contents(__FILE__) === file_get_contents(__DIR__.'/../vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/skeleton/app/SymfonyRequirements.php'),
+            'Requirements file should be up-to-date',
+            'Your requirements file is outdated. Run composer install and re-check your configuration.'
+        );
+
+        $this->addRecommendation(
+            version_compare($installedPhpVersion, '5.3.4', '>='),
+            'You should use at least PHP 5.3.4 due to PHP bug #52083 in earlier versions',
+            'Your project might malfunction randomly due to PHP bug #52083 ("Notice: Trying to get property of non-object"). Install PHP 5.3.4 or newer.'
+        );
+        
+        $this->addRecommendation(
+            version_compare($installedPhpVersion, '5.3.8', '>='),
+            'When using annotations you should have at least PHP 5.3.8 due to PHP bug #55156',
+            'Install PHP 5.3.8 or newer if your project uses annotations.'
+        );
+
+        $this->addRecommendation(
+            version_compare($installedPhpVersion, '5.4.0', '!='),
+            'You should not use PHP 5.4.0 due to the PHP bug #61453',
+            'Your project might not work properly due to the PHP bug #61453 ("Cannot dump definitions which have method calls"). Install PHP 5.4.1 or newer.'
+        );
+
+        if (null !== $pcreVersion) {
+            $this->addRecommendation(
+                $pcreVersion >= 8.0,
+                sprintf('PCRE extension should be at least version 8.0 (%s installed)', $pcreVersion),
+                '<strong>PCRE 8.0+</strong> is preconfigured in PHP since 5.3.2 but you are using an outdated version of it. Symfony probably works anyway but it is recommended to upgrade your PCRE extension.'
+            );
+        }
+
+        $this->addRecommendation(
+            class_exists('DomDocument'),
+            'PHP-XML module should be installed',
+            'Install and enable the <strong>PHP-XML</strong> module.'
+        );
+
+        $this->addRecommendation(
+            function_exists('mb_strlen'),
+            'mb_strlen() should be available',
+            'Install and enable the <strong>mbstring</strong> extension.'
+        );
+
+        $this->addRecommendation(
+            function_exists('iconv'),
+            'iconv() should be available',
+            'Install and enable the <strong>iconv</strong> extension.'
+        );
+
+        $this->addRecommendation(
+            function_exists('utf8_decode'),
+            'utf8_decode() should be available',
+            'Install and enable the <strong>XML</strong> extension.'
+        );
+
+        if (!defined('PHP_WINDOWS_VERSION_BUILD')) {
+            $this->addRecommendation(
+                function_exists('posix_isatty'),
+                'posix_isatty() should be available',
+                'Install and enable the <strong>php_posix</strong> extension (used to colorize the CLI output).'
+            );
+        }
+
+        $this->addRecommendation(
+            class_exists('Locale'),
+            'intl extension should be available',
+            'Install and enable the <strong>intl</strong> extension (used for validators).'
+        );
+
+        if (class_exists('Collator')) {
+            $this->addRecommendation(
+                null !== new Collator('fr_FR'),
+                'intl extension should be correctly configured',
+                'The intl extension does not behave properly. This problem is typical on PHP 5.3.X x64 WIN builds.'
+            );
+        }
+
+        if (class_exists('Locale')) {
+            if (defined('INTL_ICU_VERSION')) {
+                $version = INTL_ICU_VERSION;
+            } else {
+                $reflector = new ReflectionExtension('intl');
+
+                ob_start();
+                $reflector->info();
+                $output = strip_tags(ob_get_clean());
+
+                preg_match('/^ICU version +(?:=> )?(.*)$/m', $output, $matches);
+                $version = $matches[1];
+            }
+
+            $this->addRecommendation(
+                version_compare($version, '4.0', '>='),
+                'intl ICU version should be at least 4+',
+                'Upgrade your <strong>intl</strong> extension with a newer ICU version (4+).'
+            );
+        }
+
+        $accelerator =
+            (function_exists('apc_store') && ini_get('apc.enabled'))
+            ||
+            function_exists('eaccelerator_put') && ini_get('eaccelerator.enable')
+            ||
+            function_exists('xcache_set')
+        ;
+
+        $this->addRecommendation(
+            $accelerator,
+            'a PHP accelerator should be installed',
+            'Install and enable a <strong>PHP accelerator</strong> like APC (highly recommended).'
+        );
+
+        $this->addPhpIniRecommendation('short_open_tag', false);
+
+        $this->addPhpIniRecommendation('magic_quotes_gpc', false, true);
+
+        $this->addPhpIniRecommendation('register_globals', false, true);
+
+        $this->addPhpIniRecommendation('session.auto_start', false);
+
+        $this->addRecommendation(
+            class_exists('PDO'),
+            'PDO should be installed',
+            'Install <strong>PDO</strong> (mandatory for Doctrine).'
+        );
+
+        if (class_exists('PDO')) {
+            $drivers = PDO::getAvailableDrivers();
+            $this->addRecommendation(
+                count($drivers),
+                sprintf('PDO should have some drivers installed (currently available: %s)', count($drivers) ? implode(', ', $drivers) : 'none'),
+                'Install <strong>PDO drivers</strong> (mandatory for Doctrine).'
+            );
+        }
+    }
+}

app/autoload.php

@@ -1,60 +1,16 @@
 <?php
 
-use Symfony\Component\ClassLoader\UniversalClassLoader;
 use Doctrine\Common\Annotations\AnnotationRegistry;
 
-$loader = new UniversalClassLoader();
-$loader->registerNamespaces(array(
-    'Symfony'          => array(__DIR__.'/../vendor/symfony/src', __DIR__.'/../vendor/bundles'),
-    'Sensio'           => __DIR__.'/../vendor/bundles',
-    'JMS'              => __DIR__.'/../vendor/bundles',
-    'Doctrine\\Common' => __DIR__.'/../vendor/doctrine-common/lib',
-    'Doctrine\\DBAL'   => __DIR__.'/../vendor/doctrine-dbal/lib',
-    'Doctrine'         => __DIR__.'/../vendor/doctrine/lib',
-    'Monolog'          => __DIR__.'/../vendor/monolog/src',
-    'Assetic'          => __DIR__.'/../vendor/assetic/src',
-    'Metadata'         => __DIR__.'/../vendor/metadata/src',
-    'FOS'              => __DIR__.'/../vendor/bundles',
-    'Gregwar'          => __DIR__.'/../vendor/bundles',
-    'Doctrine\\Common\\DataFixtures' => __DIR__.'/../vendor/doctrine-fixtures/lib',
-    'Doctrine\\Common'               => __DIR__.'/../vendor/doctrine-common/lib',
-    'Stof'             => __DIR__.'/../vendor/bundles',
-    'Gedmo'            => __DIR__.'/../vendor/gedmo-doctrine-extensions/lib',
-    'WhiteOctober'     => __DIR__.'/../vendor/bundles',
-    'Pagerfanta'       => __DIR__.'/../vendor/pagerfanta/src',
-    'Sonata'           => __DIR__.'/../vendor/bundles',
-    'Knp'              => array(
-                         __DIR__.'/../vendor/bundles',
-                         __DIR__.'/../vendor/knp/menu/src',
-    ),
-));
-$loader->registerPrefixes(array(
-    'Twig_Extensions_' => __DIR__.'/../vendor/twig-extensions/lib',
-    'Twig_'            => __DIR__.'/../vendor/twig/lib',
-));
+$loader = include __DIR__.'/../vendor/autoload.php';
 
 // intl
 if (!function_exists('intl_get_error_code')) {
-    require_once __DIR__.'/../vendor/symfony/src/Symfony/Component/Locale/Resources/stubs/functions.php';
+    require_once __DIR__.'/../vendor/symfony/symfony/src/Symfony/Component/Locale/Resources/stubs/functions.php';
 
-    $loader->registerPrefixFallbacks(array(__DIR__.'/../vendor/symfony/src/Symfony/Component/Locale/Resources/stubs'));
+    $loader->add('', __DIR__.'/../vendor/symfony/symfony/src/Symfony/Component/Locale/Resources/stubs');
 }
 
-$loader->registerNamespaceFallbacks(array(
-    __DIR__.'/../src',
-));
-$loader->register();
-
-AnnotationRegistry::registerLoader(function($class) use ($loader) {
-    $loader->loadClass($class);
-    return class_exists($class, false);
-});
-AnnotationRegistry::registerFile(__DIR__.'/../vendor/doctrine/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php');
-
-// Swiftmailer needs a special autoloader to allow
-// the lazy loading of the init file (which is expensive)
-
-//require_once __DIR__.'/../vendor/swiftmailer/lib/classes/Swift.php';
-require __DIR__.'/../vendor/swiftmailer/lib/swift_required.php';
-//Swift::registerAutoload(__DIR__.'/../vendor/swiftmailer/lib/swift_init.php');
+AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
 
+return $loader;

app/check.php

@@ -1,105 +1,51 @@
 <?php
 
-if (!$iniPath = get_cfg_var('cfg_file_path')) {
-    $iniPath = 'WARNING: not using a php.ini file';
-}
+require_once dirname(__FILE__).'/SymfonyRequirements.php';
+
+$symfonyRequirements = new SymfonyRequirements();
+
+$iniPath = $symfonyRequirements->getPhpIniConfigPath();
 
 echo "********************************\n";
 echo "*                              *\n";
 echo "*  Symfony requirements check  *\n";
 echo "*                              *\n";
 echo "********************************\n\n";
-echo sprintf("php.ini used by PHP: %s\n\n", $iniPath);
 
-echo "** WARNING **\n";
+echo $iniPath ? sprintf("* Configuration file used by PHP: %s\n\n", $iniPath) : "* WARNING: No configuration file (php.ini) used by PHP!\n\n";
+
+echo "** ATTENTION **\n";
 echo "*  The PHP CLI can use a different php.ini file\n";
 echo "*  than the one used with your web server.\n";
 if ('\\' == DIRECTORY_SEPARATOR) {
     echo "*  (especially on the Windows platform)\n";
 }
-echo "*  If this is the case, please ALSO launch this\n";
-echo "*  utility from your web server.\n";
-echo "** WARNING **\n";
-
-// mandatory
-echo_title("Mandatory requirements");
-check(version_compare(phpversion(), '5.3.2', '>='), sprintf('Checking that PHP version is at least 5.3.2 (%s installed)', phpversion()), 'Install PHP 5.3.2 or newer (current version is '.phpversion(), true);
-check(ini_get('date.timezone'), 'Checking that the "date.timezone" setting is set', 'Set the "date.timezone" setting in php.ini (like Europe/Paris)', true);
-check(is_writable(__DIR__.'/../app/cache'), sprintf('Checking that app/cache/ directory is writable'), 'Change the permissions of the app/cache/ directory so that the web server can write in it', true);
-check(is_writable(__DIR__.'/../app/logs'), sprintf('Checking that the app/logs/ directory is writable'), 'Change the permissions of the app/logs/ directory so that the web server can write in it', true);
-check(function_exists('json_encode'), 'Checking that the json_encode() is available', 'Install and enable the json extension', true);
-check(class_exists('SQLite3') || in_array('sqlite', PDO::getAvailableDrivers()), 'Checking that the SQLite3 or PDO_SQLite extension is available', 'Install and enable the SQLite3 or PDO_SQLite extension.', true);
-check(function_exists('session_start'), 'Checking that the session_start() is available', 'Install and enable the session extension', true);
-check(function_exists('ctype_alpha'), 'Checking that the ctype_alpha() is available', 'Install and enable the ctype extension', true);
-check(!(function_exists('apc_store') && ini_get('apc.enabled')) || version_compare(phpversion('apc'), '3.0.17', '>='), 'Checking that the APC version is at least 3.0.17', 'Upgrade your APC extension (3.0.17+)', true);
-
-// warnings
-echo_title("Optional checks");
-check(class_exists('DomDocument'), 'Checking that the PHP-XML module is installed', 'Install and enable the php-xml module', false);
-check(defined('LIBXML_COMPACT'), 'Checking that the libxml version is at least 2.6.21', 'Upgrade your php-xml module with a newer libxml', false);
-check(function_exists('token_get_all'), 'Checking that the token_get_all() function is available', 'Install and enable the Tokenizer extension (highly recommended)', false);
-check(function_exists('mb_strlen'), 'Checking that the mb_strlen() function is available', 'Install and enable the mbstring extension', false);
-check(function_exists('iconv'), 'Checking that the iconv() function is available', 'Install and enable the iconv extension', false);
-check(function_exists('utf8_decode'), 'Checking that the utf8_decode() is available', 'Install and enable the XML extension', false);
-check(function_exists('curl_init'), 'Checking that the curl_init() is available', 'Install and enable the curl (php5-curl package) extension', false);
-if (PHP_OS != 'WINNT') {
-    check(function_exists('posix_isatty'), 'Checking that the posix_isatty() is available', 'Install and enable the php_posix extension (used to colorized the CLI output)', false);
-}
-check(class_exists('Locale'), 'Checking that the intl extension is available', 'Install and enable the intl extension (used for validators)', false);
-if (class_exists('Locale')) {
-    $version = '';
-
-    if (defined('INTL_ICU_VERSION')) {
-        $version =  INTL_ICU_VERSION;
-    } else {
-        $reflector = new \ReflectionExtension('intl');
-
-        ob_start();
-        $reflector->info();
-        $output = strip_tags(ob_get_clean());
+echo "*  To be on the safe side, please also launch the requirements check\n";
+echo "*  from your web server using the web/config.php script.\n";
 
-        preg_match('/^ICU version +(?:=> )?(.*)$/m', $output, $matches);
-        $version = $matches[1];
-    }
+echo_title('Mandatory requirements');
 
-    check(version_compare($version, '4.0', '>='), 'Checking that the intl ICU version is at least 4+', 'Upgrade your intl extension with a newer ICU version (4+)', false);
+foreach ($symfonyRequirements->getRequirements() as $req) {
+    echo_requirement($req);
 }
 
-$accelerator = 
-    (function_exists('apc_store') && ini_get('apc.enabled'))
-    ||
-    function_exists('eaccelerator_put') && ini_get('eaccelerator.enable')
-    ||
-    function_exists('xcache_set')
-;
-check($accelerator, 'Checking that a PHP accelerator is installed', 'Install a PHP accelerator like APC (highly recommended)', false);
-
-check(!ini_get('short_open_tag'), 'Checking that php.ini has short_open_tag set to off', 'Set short_open_tag to off in php.ini', false);
-check(!ini_get('magic_quotes_gpc'), 'Checking that php.ini has magic_quotes_gpc set to off', 'Set magic_quotes_gpc to off in php.ini', false);
-check(!ini_get('register_globals'), 'Checking that php.ini has register_globals set to off', 'Set register_globals to off in php.ini', false);
-check(!ini_get('session.auto_start'), 'Checking that php.ini has session.auto_start set to off', 'Set session.auto_start to off in php.ini', false);
-
-echo_title("Optional checks (Doctrine)");
+echo_title('Optional recommendations');
 
-check(class_exists('PDO'), 'Checking that PDO is installed', 'Install PDO (mandatory for Doctrine)', false);
-if (class_exists('PDO')) {
-    $drivers = PDO::getAvailableDrivers();
-    check(count($drivers), 'Checking that PDO has some drivers installed: '.implode(', ', $drivers), 'Install PDO drivers (mandatory for Doctrine)');
+foreach ($symfonyRequirements->getRecommendations() as $req) {
+    echo_requirement($req);
 }
 
 /**
- * Checks a configuration.
+ * Prints a Requirement instance
  */
-function check($boolean, $message, $help = '', $fatal = false)
+function echo_requirement(Requirement $requirement)
 {
-    echo $boolean ? "  OK        " : sprintf("\n\n[[%s]] ", $fatal ? ' ERROR ' : 'WARNING');
-    echo sprintf("$message%s\n", $boolean ? '' : ': FAILED');
+    $result = $requirement->isFulfilled() ? 'OK' : ($requirement->isOptional() ? 'WARNING' : 'ERROR');
+    echo ' ' . str_pad($result, 9);
+    echo $requirement->getTestMessage() . "\n";
 
-    if (!$boolean) {
-        echo "            *** $help ***\n";
-        if ($fatal) {
-            exit("You must fix this problem before resuming the check.\n");
-        }
+    if (!$requirement->isFulfilled()) {
+        echo sprintf("          %s\n\n", $requirement->getHelpText());
     }
 }
 

app/config/config_prod.yml

@@ -1,10 +1,19 @@
 imports:
     - { resource: config.yml }
 
+# In production environment you should know that the parameters for URL generation
+# always pass the requirements. Otherwise it would break your link (or even site with
+# strict_requirements = true). So we can disable the requirements check completely for
+# enhanced performance with strict_requirements = null.
+framework:
+    router:
+        strict_requirements: null
+
 #doctrine:
-#    metadata_cache_driver: apc
-#    result_cache_driver: apc
-#    query_cache_driver: apc
+# orm:
+# metadata_cache_driver: apc
+# result_cache_driver: apc
+# query_cache_driver: apc
 
 monolog:
     handlers:

app/config/config_test.yml

@@ -4,7 +4,8 @@ imports:
 framework:
     test: ~
     session:
-        storage_id: session.storage.filesystem
+        # UPGRADE 2.1
+        storage_id: session.storage.mock_file 
 
 web_profiler:
     toolbar: false

app/config/parameters.ini

@@ -1,16 +0,0 @@
-; These parameters can be imported into other config files
-; by enclosing the key with % (like %database_user%)
-; Comments start with ';', as in php.ini
-[parameters]
-    database_driver="pdo_mysql"
-    database_host="localhost"
-    database_port="3306"
-    database_name="muzich"
-    database_user="muzich"
-    database_password="muzich"
-    mailer_transport="smtp"
-    mailer_host="localhost"
-    mailer_user=""
-    mailer_password=""
-    locale="fr"
-    secret="***REMOVED***"

app/config/routing.yml

@@ -2,18 +2,18 @@
 #_internal:
 #   resource: "@FrameworkBundle/Resources/config/routing/internal.xml"
 #   prefix:   /_internal
-  
-admin:
-    resource: '@SonataAdminBundle/Resources/config/routing/sonata_admin.xml'
-    prefix: /admin
-
-_sonata_admin:
-    resource: .
-    type: sonata_admin
-    prefix: /admin
-  
-MuzichAdminBundle:
-  resource: "@MuzichAdminBundle/Resources/config/routing.yml"
+# 
+#admin:
+#    resource: '@SonataAdminBundle/Resources/config/routing/sonata_admin.xml'
+#    prefix: /admin
+#
+#_sonata_admin:
+#    resource: .
+#    type: sonata_admin
+#    prefix: /admin
+#  
+#MuzichAdminBundle:
+#  resource: "@MuzichAdminBundle/Resources/config/routing.yml"
   
 MuzichIndexBundle:
   resource: "@MuzichIndexBundle/Resources/config/routing.yml"

app/config/routing_dev.yml

@@ -11,9 +11,9 @@ _demo:
     type:     annotation
     prefix:   /demo
 
-_assetic:
-    resource: .
-    type:     assetic
+#_assetic:
+#    resource: .
+#    type:     assetic
 
 _wdt:
     resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml"

app/config/security.yml

@@ -1,12 +1,13 @@
 imports:
     - { resource: "@MuzichCoreBundle/Resources/config/security.yml" }
 
-security:
-    encoders:
-        'FOS\UserBundle\Model\UserInterface':
-            algorithm: sha512
-            encode_as_base64: false
-            iterations: 10
+#security:
+#    providers:
+#            in_memory:
+#                memory:
+#                    users:
+#                        user:  { password: userpass, roles: [ 'ROLE_USER' ] }
+#                        admin: { password: adminpass, roles: [ 'ROLE_ADMIN' ] }
 
 #security:
 #    encoders:

bin/vendors

@@ -1,127 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-/*
- * This file is part of the Symfony Standard Edition.
- *
- * (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.
- */
-
-$rootDir = dirname(__DIR__);
-$vendorDir = $rootDir.'/vendor';
-
-array_shift($argv);
-if (!isset($argv[0])) {
-    exit(<<<EOF
-Symfony2 vendors script management.
-
-Specify a command to run:
-
- install: install vendors as specified in deps or deps.lock (recommended)
- update:  update vendors to their latest versions (as specified in deps)
-
-
-EOF
-    );
-}
-
-if (!in_array($command = array_shift($argv), array('install', 'update'))) {
-    exit(sprintf("Command \"%s\" does not exist.\n", $command));
-}
-
-/*
- * Check wether this project is based on the Standard Edition that was
- * shipped with vendors or not.
- */
-if (is_dir($vendorDir.'/symfony') && !is_dir($vendorDir.'/symfony/.git') && !in_array('--reinstall', $argv)) {
-    exit(<<<EOF
-Your project seems to be based on a Standard Edition that includes vendors.
-
-Try to run ./bin/vendors install --reinstall
-
-
-EOF
-    );
-}
-
-if (!is_dir($vendorDir)) {
-    mkdir($vendorDir, 0777, true);
-}
-
-// versions
-$versions = array();
-if ('install' === $command && file_exists($rootDir.'/deps.lock')) {
-    foreach (file($rootDir.'/deps.lock', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) as $line) {
-        $parts = array_values(array_filter(explode(' ', $line)));
-        if (2 !== count($parts)) {
-            exit(sprintf('The deps version file is not valid (near "%s")', $line));
-        }
-        $versions[$parts[0]] = $parts[1];
-    }
-}
-
-$newversions = array();
-$deps = parse_ini_file($rootDir.'/deps', true, INI_SCANNER_RAW);
-if (false === $deps) {
-    exit("The deps file is not valid ini syntax. Perhaps missing a trailing newline?\n");
-}
-foreach ($deps as $name => $dep) {
-    $dep = array_map('trim', $dep);
-
-    // revision
-    if (isset($versions[$name])) {
-        $rev = $versions[$name];
-    } else {
-        $rev = isset($dep['version']) ? $dep['version'] : 'origin/HEAD';
-    }
-
-    // install dir
-    $installDir = isset($dep['target']) ? $vendorDir.'/'.$dep['target'] : $vendorDir.'/'.$name;
-    if (in_array('--reinstall', $argv)) {
-        if (PHP_OS == 'WINNT') {
-            system(sprintf('rmdir /S /Q %s', escapeshellarg(realpath($installDir))));
-        } else {
-            system(sprintf('rm -rf %s', escapeshellarg($installDir)));
-        }
-    }
-
-    echo "> Installing/Updating $name\n";
-
-    // url
-    if (!isset($dep['git'])) {
-        exit(sprintf('The "git" value for the "%s" dependency must be set.', $name));
-    }
-    $url = $dep['git'];
-
-    if (!is_dir($installDir)) {
-        system(sprintf('git clone %s %s', escapeshellarg($url), escapeshellarg($installDir)));
-    }
-
-    system(sprintf('cd %s && git fetch origin && git reset --hard %s', escapeshellarg($installDir), escapeshellarg($rev)));
-
-    if ('update' === $command) {
-        ob_start();
-        system(sprintf('cd %s && git log -n 1 --format=%%H', escapeshellarg($installDir)));
-        $newversions[] = trim($name.' '.ob_get_clean());
-    }
-}
-
-// update?
-if ('update' === $command) {
-    file_put_contents($rootDir.'/deps.lock', implode("\n", $newversions));
-}
-
-// php on windows can't use the shebang line from system()
-$interpreter = PHP_OS == 'WINNT' ? 'php.exe' : '';
-
-// Update the bootstrap files
-system(sprintf('%s %s', $interpreter, escapeshellarg($rootDir.'/vendor/bundles/Sensio/Bundle/DistributionBundle/Resources/bin/build_bootstrap.php')));
-
-// Update assets
-system(sprintf('%s %s assets:install %s', $interpreter, escapeshellarg($rootDir.'/app/console'), escapeshellarg($rootDir.'/web/')));
-
-// Remove the cache
-system(sprintf('%s %s cache:clear --no-warmup', $interpreter, escapeshellarg($rootDir.'/app/console')));

composer.json

@@ -0,0 +1,50 @@
+{
+    "name": "symfony/framework-standard-edition",
+    "description": "The \"Symfony Standard Edition\" distribution",
+    "autoload": {
+        "psr-0": { "": "src/" }
+    },
+    "require": {
+        "php": ">=5.3.3",
+        "symfony/symfony": "2.1.*",
+        "doctrine/orm": ">=2.2.3,<2.4-dev",
+        "doctrine/doctrine-bundle": "1.1.*",
+        "twig/extensions": "1.0.*@dev",
+        "symfony/assetic-bundle": "2.1.*",
+        "symfony/swiftmailer-bundle": "2.1.*",
+        "symfony/monolog-bundle": "2.1.*",
+        "sensio/distribution-bundle": "2.1.*",
+        "sensio/framework-extra-bundle": "2.1.*",
+        "sensio/generator-bundle": "2.1.*",
+        "jms/security-extra-bundle": "1.2.*",
+        "jms/di-extra-bundle": "1.1.*",
+        "kriswallsmith/assetic": "1.1.*@dev",
+        
+        "friendsofsymfony/user-bundle": "*",
+        "doctrine/data-fixtures" : "dev-master",
+        "doctrine/doctrine-fixtures-bundle": "dev-master",
+        "stof/doctrine-extensions-bundle": "dev-master",
+        "gregwar/image-bundle": "dev-master"
+    },
+    "scripts": {
+        "post-install-cmd": [
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
+        ],
+        "post-update-cmd": [
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
+        ]
+    },
+    "extra": {
+        "symfony-app-dir": "app",
+        "symfony-web-dir": "web",
+        "branch-alias": {
+            "dev-master": "2.1-dev"
+        }
+    }
+}

deps

@@ -1,64 +0,0 @@
-[symfony]
-    git=http://github.com/symfony/symfony.git
-    version=v2.0.22
-
-[twig]
-    git=http://github.com/fabpot/Twig.git
-    version=v1.10.3
-
-[monolog]
-    git=http://github.com/Seldaek/monolog.git
-    version=1.2.1
-
-[doctrine-common]
-    git=http://github.com/doctrine/common.git
-    version=2.1.4
-
-[doctrine-dbal]
-    git=http://github.com/doctrine/dbal.git
-    version=2.1.7
-
-[doctrine]
-    git=http://github.com/doctrine/doctrine2.git
-    version=2.1.7
-
-[swiftmailer]
-    git=http://github.com/swiftmailer/swiftmailer.git
-    version=v4.2.2
-
-[assetic]
-    git=http://github.com/kriswallsmith/assetic.git
-    version=v1.0.4
-
-[twig-extensions]
-    git=http://github.com/fabpot/Twig-extensions.git
-    version=v1.0.0-alpha
-
-[metadata]
-    git=http://github.com/schmittjoh/metadata.git
-    version=1.0.0
-
-[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
-    target=/bundles/Sensio/Bundle/GeneratorBundle
-    version=origin/2.0
-
-[AsseticBundle]
-    git=http://github.com/symfony/AsseticBundle.git
-    target=/bundles/Symfony/Bundle/AsseticBundle
-    version=origin/2.0

deps.lock

@@ -1,15 +0,0 @@
-symfony v2.0.22
-twig v1.10.3
-monolog 1.2.1
-doctrine-common 2.1.4
-doctrine-dbal 2.1.7
-doctrine 2.1.7
-swiftmailer v4.2.2
-assetic v1.0.4
-twig-extensions v1.0.0-alpha
-metadata 1.0.0
-SensioFrameworkExtraBundle v2.0.22
-JMSSecurityExtraBundle e752f888c51425f71382c056961f10f2be642102
-SensioDistributionBundle v2.0.22
-SensioGeneratorBundle v2.0.22
-AsseticBundle 6f15728c1aefa5246caa83730e3dbf70b0d46052

src/Acme/DemoBundle/Controller/DemoController.php

@@ -40,7 +40,7 @@ class DemoController extends Controller
 
         $request = $this->get('request');
         if ('POST' == $request->getMethod()) {
-            $form->bindRequest($request);
+            $form->bind($request);
             if ($form->isValid()) {
                 $mailer = $this->get('mailer');
                 // .. setup a message and send it

src/Acme/DemoBundle/Form/ContactType.php

@@ -3,11 +3,11 @@
 namespace Acme\DemoBundle\Form;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
 
 class ContactType extends AbstractType
 {
-    public function buildForm(FormBuilder $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->add('email', 'email');
         $builder->add('message', 'textarea');

src/Muzich/AdminBundle/Admin/ElementAdmin.php

@@ -1,58 +0,0 @@
-<?php
-
-namespace Muzich\AdminBundle\Admin;
-
-use Sonata\AdminBundle\Admin\Admin;
-use Sonata\AdminBundle\Form\FormMapper;
-use Sonata\AdminBundle\Datagrid\DatagridMapper;
-use Sonata\AdminBundle\Datagrid\ListMapper;
-
-class ElementAdmin extends Admin
-{
-  
-  protected function configureListFields(ListMapper $listMapper)
-  {
-    $listMapper
-      ->addIdentifier('name')
-      ->add('owner', 'many_to_one')
-      ->add('type')
-      ->add('tags')
-      ->add('_action', 'actions', array(
-        'actions' => array(
-          'view' => array(),
-          'edit' => array(),
-        )
-      ))
-    ;
-  }
-  
-  protected function configureDatagridFilters(DatagridMapper $datagrid)
-  {
-    $datagrid
-      ->add('name')
-      ->add('url')
-      ->add('tags')
-      ->add('type')
-    ;
-  }
-  
-  protected function configureFormFields(FormMapper $formMapper)
-  {
-    $formMapper
-      ->add('type', 'sonata_type_model', array(), array('edit' => 'list'))
-      ->add('name')
-      ->add('url')
-      ->add('owner', 'sonata_type_model', array(), array('edit' => 'list'))
-      ->add('group', 'sonata_type_model', array('required' => false), array('edit' => 'list'))
-      ->add('embed', null, array('required' => false))
-      ->add('tags', null, array('required' => false))
-      
-    ;
-  }
-
-//  public function validate(ErrorElement $errorElement, $object)
-//  {
-//     
-//  }
-  
-}

src/Muzich/AdminBundle/Admin/ElementTypeAdmin.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace Muzich\AdminBundle\Admin;
-
-use Sonata\AdminBundle\Admin\Admin;
-use Sonata\AdminBundle\Form\FormMapper;
-use Sonata\AdminBundle\Datagrid\DatagridMapper;
-use Sonata\AdminBundle\Datagrid\ListMapper;
-
-class ElementTypeAdmin extends Admin
-{
-  
-  protected function configureListFields(ListMapper $listMapper)
-  {
-    $listMapper
-      ->addIdentifier('id')
-      ->add('name')
-    ;
-  }
-  
-  protected function configureDatagridFilters(DatagridMapper $datagrid)
-  {
-    $datagrid
-      ->add('name')
-    ;
-  }
-  
-  protected function configureFormFields(FormMapper $formMapper)
-  {
-    $formMapper
-      ->add('id')
-      ->add('name')
-    ;
-  }
-
-//  public function validate(ErrorElement $errorElement, $object)
-//  {
-//     
-//  }
-  
-}

src/Muzich/AdminBundle/Admin/GroupAdmin.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace Muzich\AdminBundle\Admin;
-
-use Sonata\AdminBundle\Admin\Admin;
-use Sonata\AdminBundle\Form\FormMapper;
-use Sonata\AdminBundle\Datagrid\DatagridMapper;
-use Sonata\AdminBundle\Datagrid\ListMapper;
-
-class GroupAdmin extends Admin
-{
-  
-  protected function configureListFields(ListMapper $listMapper)
-  {
-    $listMapper
-      ->addIdentifier('name')
-      ->add('open')
-      ->add('owner', 'many_to_one')
-      ->add('tags')
-      ->add('_action', 'actions', array(
-        'actions' => array(
-          'view' => array(),
-          'edit' => array(),
-        )
-      ))
-    ;
-  }
-  
-  protected function configureDatagridFilters(DatagridMapper $datagrid)
-  {
-    $datagrid
-      ->add('name')
-      ->add('tags')
-    ;
-  }
-  
-  protected function configureFormFields(FormMapper $formMapper)
-  {
-    $formMapper
-      ->add('name')
-      ->add('description')
-      ->add('open', null, array('required' => false))
-      ->add('owner', 'sonata_type_model', array(), array('edit' => 'list'))
-      // Attention, il semble que le lien pointe vers des records de la table de relation
-      // il faudra utiliser le many to many, quand j'y arriverai ...
-      //->add('tags', null, array('required' => false))
-      
-    ;
-  }
-
-//  public function validate(ErrorElement $errorElement, $object)
-//  {
-//     
-//  }
-  
-}

src/Muzich/AdminBundle/Admin/RegistrationTokenAdmin.php

@@ -1,48 +0,0 @@
-<?php
-
-namespace Muzich\AdminBundle\Admin;
-
-use Sonata\AdminBundle\Admin\Admin;
-use Sonata\AdminBundle\Form\FormMapper;
-use Sonata\AdminBundle\Datagrid\DatagridMapper;
-use Sonata\AdminBundle\Datagrid\ListMapper;
-
-class RegistrationTokenAdmin extends Admin
-{
-  
-  protected function configureListFields(ListMapper $listMapper)
-  {
-    $listMapper
-      ->addIdentifier('id')
-      ->addIdentifier('token')
-      ->add('used')
-      ->add('count')
-      ->add('count_max')
-      ->add('_action', 'actions', array(
-        'actions' => array(
-          'view' => array(),
-          'edit' => array(),
-        )
-      ))
-    ;
-  }
-  
-  protected function configureDatagridFilters(DatagridMapper $datagrid)
-  {
-    $datagrid
-      ->add('token')
-      ->add('used')
-    ;
-  }
-  
-  protected function configureFormFields(FormMapper $formMapper)
-  {
-    $formMapper
-      ->add('token')
-      ->add('count')
-      ->add('count_max')
-      ->add('used')
-    ;
-  }
-  
-}

src/Muzich/AdminBundle/Admin/TagAdmin.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace Muzich\AdminBundle\Admin;
-
-use Sonata\AdminBundle\Admin\Admin;
-use Sonata\AdminBundle\Form\FormMapper;
-use Sonata\AdminBundle\Datagrid\DatagridMapper;
-use Sonata\AdminBundle\Datagrid\ListMapper;
-
-class TagAdmin extends Admin
-{
-  
-  protected function configureListFields(ListMapper $listMapper)
-  {
-    $listMapper
-      ->addIdentifier('id')
-      ->addIdentifier('name')
-      ->add('_action', 'actions', array(
-        'actions' => array(
-          'view' => array(),
-          'edit' => array(),
-        )
-      ))
-    ;
-  }
-  
-  protected function configureDatagridFilters(DatagridMapper $datagrid)
-  {
-    $datagrid
-      ->add('name')
-    ;
-  }
-  
-  protected function configureFormFields(FormMapper $formMapper)
-  {
-    $formMapper
-      ->add('name')
-    ;
-  }
-
-//  public function validate(ErrorElement $errorElement, $object)
-//  {
-//     
-//  }
-  
-}

src/Muzich/AdminBundle/Admin/UserAdmin.php

@@ -1,95 +0,0 @@
-<?php
-
-namespace Muzich\AdminBundle\Admin;
-
-use Sonata\AdminBundle\Admin\Admin;
-use Sonata\AdminBundle\Form\FormMapper;
-use Sonata\AdminBundle\Datagrid\DatagridMapper;
-use Sonata\AdminBundle\Datagrid\ListMapper;
-
-use FOS\UserBundle\Model\UserManagerInterface;
-
-class UserAdmin extends Admin
-{
-  
-  protected $userManager;
-  
-  protected function configureListFields(ListMapper $listMapper)
-  {
-    $listMapper
-      ->addIdentifier('username')
-      ->add('email')
-      ->add('enabled')
-      ->add('_action', 'actions', array(
-        'actions' => array(
-          'view' => array(),
-          'edit' => array(),
-        )
-      ))
-    ;
-  }
-  
-  protected function configureDatagridFilters(DatagridMapper $datagrid)
-  {
-    $datagrid
-      ->add('username')
-      ->add('email')
-      ->add('enabled')
-    ;
-  }
-//  
-//  protected function configureFormFields(FormMapper $formMapper)
-//  {
-//    $formMapper
-//      ->add('email')
-//      ->add('enabled', null, array('required' => false))
-//      //->add('password')
-//      ->add('confirmationToken', null, array('required' => false))
-//    ;
-//  }
-//
-////  public function validate(ErrorElement $errorElement, $object)
-////  {
-////     
-////  }
-  
-  protected function configureFormFields(FormMapper $formMapper)
-  {
-      $formMapper
-          ->with('General')
-              ->add('username')
-              ->add('email')
-              ->add('plainPassword', 'text')
-          ->end()
-//          ->with('Groups')
-//              ->add('groups', 'sonata_type_model', array('required' => false))
-//          ->end()
-          ->with('Management')
-//              ->add('roles', 'sonata_security_roles', array( 'multiple' => true))
-              ->add('locked', null, array('required' => false))
-              ->add('expired', null, array('required' => false))
-              ->add('enabled', null, array('required' => false))
-              ->add('credentialsExpired', null, array('required' => false))
-          ->end()
-      ;
-  }
-  public function preUpdate($user)
-  {
-      $this->getUserManager()->updateCanonicalFields($user);
-      $this->getUserManager()->updatePassword($user);
-  }
-
-  public function setUserManager(UserManagerInterface $userManager)
-  {
-      $this->userManager = $userManager;
-  }
-
-  /**
-   * @return UserManagerInterface
-   */
-  public function getUserManager()
-  {
-      return $this->userManager;
-  }
-  
-}

src/Muzich/AdminBundle/Controller/DefaultController.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace Muzich\AdminBundle\Controller;
-
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-
-
-class DefaultController extends Controller
-{
-    
-    public function indexAction($name)
-    {
-        return $this->render('MuzichAdminBundle:Default:index.html.twig', array('name' => $name));
-    }
-}

src/Muzich/AdminBundle/Controller/ElementAdminController.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace Muzich\AdminBundle\Controller;
-
-use Sonata\AdminBundle\Controller\CRUDController as Controller;
-
-class ElementAdminController extends Controller
-{
-}

src/Muzich/AdminBundle/Controller/ElementTypeAdminController.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace Muzich\AdminBundle\Controller;
-
-use Sonata\AdminBundle\Controller\CRUDController as Controller;
-
-class ElementTypeAdminController extends Controller
-{
-}

src/Muzich/AdminBundle/Controller/GroupAdminController.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace Muzich\AdminBundle\Controller;
-
-use Sonata\AdminBundle\Controller\CRUDController as Controller;
-
-class GroupAdminController extends Controller
-{
-}

src/Muzich/AdminBundle/Controller/ModerateController.php

@@ -1,427 +0,0 @@
-<?php
-
-namespace Muzich\AdminBundle\Controller;
-
-use Muzich\CoreBundle\lib\Controller;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
-//use Muzich\CoreBundle\Util\TagLike;
-use Muzich\CoreBundle\Entity\UsersTagsFavorites;
-use Muzich\CoreBundle\Entity\GroupsTagsFavorites;
-use Muzich\CoreBundle\Managers\TagManager;
-use Muzich\CoreBundle\Propagator\EventElement;
-use Muzich\CoreBundle\Managers\CommentsManager;
-
-class ModerateController extends Controller
-{
-    
-  /**
-   *
-   * @Template()
-   */
-  public function indexAction()
-  {
-    $count_tags = $this->getDoctrine()->getRepository('MuzichCoreBundle:Tag')
-      ->countToModerate();
-    $count_elements = $this->getDoctrine()->getRepository('MuzichCoreBundle:Element')
-      ->countToModerate();
-    $count_comments = $this->getDoctrine()->getRepository('MuzichCoreBundle:Element')
-      ->countForCommentToModerate();
-    
-    return array(
-      'count_tags' => $count_tags,
-      'count_elements' => $count_elements,
-      'count_comments' => $count_comments
-    );
-  }
-    
-  /**
-   *
-   * @Template()
-   */
-  public function tagsAction()
-  {
-    // Récupération des tags
-    $tags = $this->getDoctrine()->getRepository('MuzichCoreBundle:Tag')
-      ->getToModerate();
-    
-    // TODO: Ajouter a chaque tag la liste des tags ressemblant
-    
-    return array(
-      'tags' => $tags
-    );
-  }
-  
-  public function tagAcceptAction($tag_id)
-  {
-    if (($response = $this->mustBeConnected(true)))
-    {
-      return $response;
-    }
-    
-    if (!($tag = $this->getDoctrine()->getRepository('MuzichCoreBundle:Tag')->findOneBy(array(
-      'id'         => $tag_id,
-      'tomoderate' => true
-    ))))
-    {
-      return $this->jsonResponse(array(
-        'status'  => 'error',
-        'message' => 'NotFound'
-      ));
-    }
-    
-    $tagManager = new TagManager();
-    if (!$tagManager->moderateTag($this->getDoctrine(), $tag, true))
-    {
-      return $this->jsonResponse(array(
-        'status'  => 'error',
-        'message' => 'NotFound'
-      ));
-    }
-    
-    return $this->jsonResponse(array(
-      'status' => 'success'
-    ));
-  }
-  
-  public function tagRefuseAction($tag_id)
-  {
-    if (($response = $this->mustBeConnected(true)))
-    {
-      return $response;
-    }
-    
-    if (!($tag = $this->getDoctrine()->getRepository('MuzichCoreBundle:Tag')->findOneBy(array(
-      'id'         => $tag_id,
-      'tomoderate' => true
-    ))))
-    {
-      return $this->jsonResponse(array(
-        'status'  => 'error',
-        'message' => 'NotFound'
-      ));
-    }
-    
-    $tagManager = new TagManager();
-    if (!$tagManager->moderateTag($this->getDoctrine(), $tag, false))
-    {
-      return $this->jsonResponse(array(
-        'status'  => 'error',
-        'message' => 'NotFound'
-      ));
-    }
-    
-    // Tout c'est bien passé, on incremente ceci dit le compteur
-    // de tag refusés par la modération pour le ou les utilisateurs
-    // ayant fait la demande d'ajout
-    $uids = json_decode($tag->getPrivateids(), true);
-    
-    $users = $this->getDoctrine()->getEntityManager()
-      ->createQuery('
-        SELECT u FROM MuzichCoreBundle:User u
-        WHERE u.id IN (:uids)'
-      )
-      ->setParameter('uids', $uids)
-      ->getResult()
-    ;
-    
-    // Pour chacun on augmente le compteur
-    foreach ($users as $user)
-    {
-      $user->addModeratedTagCount();
-      $this->getDoctrine()->getEntityManager()->persist($user);
-    }
-    
-    $this->getDoctrine()->getEntityManager()->flush();
-    
-    return $this->jsonResponse(array(
-      'status' => 'success'
-    ));
-  }
-  
-  /**
-   * Cette action est plus délicate, elle consiste a remplacer le tag en question
-   * par un autre.
-   *
-   * @param int $tag_id
-   * @param int $tag_new_id
-   * @return view 
-   */
-  public function tagReplaceAction($tag_id, $tag_new_id)
-  {
-    if (($response = $this->mustBeConnected(true)))
-    {
-      return $response;
-    }
-    
-    if (!($tag = $this->getDoctrine()->getRepository('MuzichCoreBundle:Tag')->findOneBy(array(
-      'id'         => $tag_id,
-      'tomoderate' => true
-    ))))
-    {
-      return $this->jsonResponse(array(
-        'status'  => 'error',
-        'message' => 'NotFound'
-      ));
-    }
-    
-    $tag_array = json_decode($tag_new_id);
-    if (!array_key_exists(0, $tag_array))
-    {
-      return $this->jsonResponse(array(
-        'status'  => 'error',
-        'message' => 'netTagError'
-      ));
-    }
-    $tag_new_id = $tag_array[0];
-    
-    $tagManager = new TagManager();
-    if (!$tagManager->moderateTag($this->getDoctrine(), $tag, false, $tag_new_id))
-    {
-      return $this->jsonResponse(array(
-        'status'  => 'error',
-        'message' => 'NotFound'
-      ));
-    }
-    
-    return $this->jsonResponse(array(
-      'status' => 'success'
-    ));
-    
-  }
-  
-  /**
-   *
-   * @Template()
-   */
-  public function elementsAction()
-  {
-    // Récupération des elements
-    $elements = $this->getDoctrine()->getRepository('MuzichCoreBundle:Element')
-      ->getToModerate();
-    
-    return array(
-      'elements' => $elements
-    );
-  }
-  
-  /**
-   * 
-   */
-  public function deleteElementAction($element_id)
-  {
-    if (($response = $this->mustBeConnected(true)))
-    {
-      return $response;
-    }
-    
-    if (!($element = $this->getDoctrine()->getRepository('MuzichCoreBundle:Element')
-      ->findOneById($element_id))
-    )
-    {
-      return $this->jsonResponse(array(
-        'status' => 'error',
-        'errors' => array('NotFound')
-      ));
-    }
-    
-    $event = new EventElement($this->container);
-    $event->elementRemoved($element);
-    $element->getOwner()->addModeratedElementCount();
-
-    $this->getDoctrine()->getEntityManager()->persist($element->getOwner());
-    $this->getDoctrine()->getEntityManager()->remove($element);
-    $this->getDoctrine()->getEntityManager()->flush();
-    
-    return $this->jsonResponse(array(
-      'status' => 'success'
-    ));
-  }
-  
-  public function cleanElementAction($element_id)
-  {
-    if (($response = $this->mustBeConnected(true)))
-    {
-      return $response;
-    }
-    
-    if (!($element = $this->getDoctrine()->getRepository('MuzichCoreBundle:Element')
-      ->findOneById($element_id))
-    )
-    {
-      return $this->jsonResponse(array(
-        'status' => 'error',
-        'errors' => array('NotFound')
-      ));
-    }
-    
-    $user_ids = $element->getReportIds();
-    $element->setReportIds(null);
-    $element->setCountReport(null);
-    $this->getDoctrine()->getEntityManager()->persist($element);
-    
-    $users = $this->getDoctrine()->getEntityManager()
-      ->createQuery('
-        SELECT u FROM MuzichCoreBundle:User u
-        WHERE u.id IN (:uids)'
-      )
-      ->setParameter('uids', $user_ids)
-      ->getResult()
-    ;
-    
-    foreach ($users as $user)
-    {
-      $user->addBadReport();
-      $this->getDoctrine()->getEntityManager()->persist($user);
-    }
-    
-    $this->getDoctrine()->getEntityManager()->flush();
-    
-    return $this->jsonResponse(array(
-      'status' => 'success'
-    ));
-  }
-  
-  /**
-   *
-   * @Template()
-   */
-  public function commentsAction()
-  {
-    // Récupération des elements
-    $elements = $this->getDoctrine()->getRepository('MuzichCoreBundle:Element')
-      ->getForCommentToModerate();
-    
-    $comments = array();
-    foreach ($elements as $element)
-    {
-      $cm = new CommentsManager($element->getComments());
-      foreach ($cm->getAlertedComments() as $comment)
-      {
-        $comments[] = array(
-          'element_id' => $element->getId(),
-          'comment'    => $comment
-        );
-      }
-      
-    }
-    
-    return array(
-      'comments' => $comments
-    );
-  }
-  
-  /**
-   * Considérer le commentaire signalé comme étant tout a fait acceptable
-   * 
-   * Ceci induit:
-   * * Que le commentaire en question ne soit plus signalé 
-   * * Que le ou les ids d'utilisateurs qui l'ont signalé comme soit "pénalisé
-   * 
-   * @param int $element_id
-   * @param date $date 
-   * 
-   * @return Response
-   */
-  public function commentCleanAction($element_id, $date)
-  {
-    if (($response = $this->mustBeConnected(true)))
-    {
-      return $response;
-    }
-    
-    if (!($element = $this->getDoctrine()->getRepository('MuzichCoreBundle:Element')
-      ->findOneById($element_id))
-    )
-    {
-      return $this->jsonResponse(array(
-        'status' => 'error',
-        'errors' => array('NotFound')
-      ));
-    }
-    
-    $cm = new CommentsManager($element->getComments());
-    // On nettoie le commentaire et on récupère les ids des "signaleurs"
-    $ids = $cm->cleanAlertsOnComment($date);
-    $element->setComments($cm->get());
-    $element->setCountCommentReport($cm->countCommentAlert());
-    
-    $this->getDoctrine()->getEntityManager()->persist($element);
-    
-    // On récupère les user qui ont signalés ce commentaire
-    $users = $this->getDoctrine()->getEntityManager()
-      ->createQuery('
-        SELECT u FROM MuzichCoreBundle:User u
-        WHERE u.id IN (:uids)'
-      )
-      ->setParameter('uids', $ids)
-      ->getResult()
-    ;
-    
-    // Pour chacun on augmente le compteur de signalements inutiles
-    foreach ($users as $user)
-    {
-      $user->addBadReport();
-      $this->getDoctrine()->getEntityManager()->persist($user);
-    }
-    
-    $this->getDoctrine()->getEntityManager()->flush();
-    
-    return $this->jsonResponse(array(
-      'status' => 'success'
-    ));
-  }
-  
-  /**
-   * Considérer le commentaire signalé comme étant tout a fait acceptable
-   * 
-   * Ceci induit:
-   * * Que le commentaire en question ne soit plus signalé 
-   * * Que le ou les ids d'utilisateurs qui l'ont signalé comme soit "pénalisé
-   * 
-   * @param int $element_id
-   * @param date $date 
-   * 
-   * @return Response
-   */
-  public function commentRefuseAction($element_id, $date)
-  {
-    if (($response = $this->mustBeConnected(true)))
-    {
-      return $response;
-    }
-    
-    if (!($element = $this->getDoctrine()->getRepository('MuzichCoreBundle:Element')
-      ->findOneById($element_id))
-    )
-    {
-      return $this->jsonResponse(array(
-        'status' => 'error',
-        'errors' => array('NotFound')
-      ));
-    }
-    
-    $cm = new CommentsManager($element->getComments());
-    $comment = $cm->get($cm->getIndexWithDate($date));
-    // On supprime le commentaire
-    $cm->deleteWithDate($date);
-    $element->setComments($cm->get());
-    $element->setCountCommentReport($cm->countCommentAlert());
-    
-    // On récupère l'auteur du commentaire pour lui incrémenté son compteur
-    // de contenu modéré
-    $user = $this->getDoctrine()->getEntityManager()->getRepository('MuzichCoreBundle:User')
-      ->findOneBy(array(
-        'id' => $comment['u']['i']
-      ));
-    
-    $user->addModeratedCommentCount();
-    
-    $this->getDoctrine()->getEntityManager()->persist($user);
-    $this->getDoctrine()->getEntityManager()->persist($element);
-    $this->getDoctrine()->getEntityManager()->flush();
-    
-    return $this->jsonResponse(array(
-      'status' => 'success'
-    ));
-  }
-}

src/Muzich/AdminBundle/Controller/RegistrationTokenAdminController.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace Muzich\AdminBundle\Controller;
-
-use Sonata\AdminBundle\Controller\CRUDController as Controller;
-
-class RegistrationTokenAdminController extends Controller
-{
-}

src/Muzich/AdminBundle/Controller/TagAdminController.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace Muzich\AdminBundle\Controller;
-
-use Sonata\AdminBundle\Controller\CRUDController as Controller;
-
-class TagAdminController extends Controller
-{
-}

src/Muzich/AdminBundle/Controller/UserAdminController.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace Muzich\AdminBundle\Controller;
-
-use Sonata\AdminBundle\Controller\CRUDController as Controller;
-
-class UserAdminController extends Controller
-{
-}

src/Muzich/AdminBundle/DependencyInjection/Configuration.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace Muzich\AdminBundle\DependencyInjection;
-
-use Symfony\Component\Config\Definition\Builder\TreeBuilder;
-use Symfony\Component\Config\Definition\ConfigurationInterface;
-
-/**
- * This is the class that validates and merges configuration from your app/config files
- *
- * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class}
- */
-class Configuration implements ConfigurationInterface
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function getConfigTreeBuilder()
-    {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('muzich_admin');
-
-        // Here you should define the parameters that are allowed to
-        // configure your bundle. See the documentation linked above for
-        // more information on that topic.
-
-        return $treeBuilder;
-    }
-}

src/Muzich/AdminBundle/DependencyInjection/MuzichAdminExtension.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace Muzich\AdminBundle\DependencyInjection;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
-
-/**
- * This is the class that loads and manages your bundle configuration
- *
- * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
- */
-class MuzichAdminExtension extends Extension
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function load(array $configs, ContainerBuilder $container)
-    {
-        $configuration = new Configuration();
-        $config = $this->processConfiguration($configuration, $configs);
-
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-        $loader->load('services.yml');
-    }
-}

src/Muzich/AdminBundle/MuzichAdminBundle.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace Muzich\AdminBundle;
-
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-
-class MuzichAdminBundle extends Bundle
-{
-  
-}

src/Muzich/AdminBundle/Resources/config/routing.yml

@@ -1,49 +0,0 @@
-MuzichAdminBundle_moderate_index:
-  pattern:  /admin/moderate
-  defaults: { _controller: MuzichAdminBundle:Moderate:index }
-
-##
-
-MuzichAdminBundle_moderate_tags:
-  pattern:  /admin/moderate/tags
-  defaults: { _controller: MuzichAdminBundle:Moderate:tags }
-  
-MuzichAdminBundle_moderate_tags_accept_tag:
-  pattern:  /admin/moderate/tags/{tag_id}/accept
-  defaults: { _controller: MuzichAdminBundle:Moderate:tagAccept }
-  
-MuzichAdminBundle_moderate_tags_refuse_tag:
-  pattern:  /admin/moderate/tags/{tag_id}/refuse
-  defaults: { _controller: MuzichAdminBundle:Moderate:tagRefuse }
-  
-MuzichAdminBundle_moderate_tags_replace_tag:
-  pattern:  /admin/moderate/tags/{tag_id}/replace/{tag_new_id}
-  defaults: { _controller: MuzichAdminBundle:Moderate:tagReplace, tag_new_id: null }
-  
-##
-
-moderate_elements_index:
-  pattern:  /admin/moderate/elements
-  defaults: { _controller: MuzichAdminBundle:Moderate:elements }
-  
-moderate_element_delete:
-  pattern:  /admin/moderate/element/delete/{element_id}
-  defaults: { _controller: MuzichAdminBundle:Moderate:deleteElement }
-  
-moderate_element_clean:
-  pattern:  /admin/moderate/element/clean/{element_id}
-  defaults: { _controller: MuzichAdminBundle:Moderate:cleanElement }
-  
-##
-
-moderate_comments_index:
-  pattern:  /admin/moderate/comments
-  defaults: { _controller: MuzichAdminBundle:Moderate:comments }
-
-moderate_comment_clean:
-  pattern:  /admin/moderate/comment/{element_id}/{date}/clean
-  defaults: { _controller: MuzichAdminBundle:Moderate:commentClean }
-
-moderate_comment_refuse:
-  pattern:  /admin/moderate/comment/{element_id}/{date}/refuse
-  defaults: { _controller: MuzichAdminBundle:Moderate:commentRefuse }

src/Muzich/AdminBundle/Resources/config/services.yml

@@ -1,7 +0,0 @@
-parameters:
-#    muzich_admin.example.class: Muzich\AdminBundle\Example
-
-services:
-#    muzich_admin.example:
-#        class: %muzich_admin.example.class%
-#        arguments: [@service_id, "plain_value", %parameter%]

src/Muzich/AdminBundle/Resources/views/Default/index.html.twig

@@ -1 +0,0 @@
-Hello {{ name }}!

src/Muzich/AdminBundle/Resources/views/Moderate/comments.html.twig

@@ -1,34 +0,0 @@
-{% extends "MuzichAdminBundle:Moderate:layout.html.twig" %}
-
-{% block title %}{% endblock %}
-
-{% block content %}
-
-  <h2>{{ 'moderate.comments.title'|trans({}, 'adminui') }}</h2>
-    
-  <ul id="moderate_comments">
-    {% for comment in comments %}
-      <li class="comment" id="mod_comment_{{ comment.element_id }}_{{ comment.comment.d|date_epurate }}">
-        
-        <a href="{{ path('moderate_comment_clean', {
-          'element_id' : comment.element_id,
-          'date'       : comment.comment.d
-        }) }}" class="accept">
-         [V]
-        </a>
-        <a href="{{ path('moderate_comment_refuse', {
-          'element_id' : comment.element_id,
-          'date'       : comment.comment.d
-        }) }}" class="refuse">
-         [X]
-        </a>
-        
-        <strong>{{ comment.comment.u.s }}</strong>: 
-        
-        {{ comment.comment.c }}
-        
-      </li>
-    {% endfor %}
-  </ul>
-
-{% endblock %}

src/Muzich/AdminBundle/Resources/views/Moderate/elements.html.twig

@@ -1,41 +0,0 @@
-{% extends "MuzichAdminBundle:Moderate:layout.html.twig" %}
-
-{% block title %}{% endblock %}
-
-{% block content %}
-
-  <h2>{{ 'moderate.elements.title'|trans({}, 'adminui') }}</h2>
-    
-  <ul id="moderate_elements">
-    {% for element in elements %}
-      <li class="element" id="mod_element_{{ element.id }}">
-        
-        <div class="controls">
-          <a class="delete" href="{{ path('moderate_element_delete', {'element_id':element.id}) }}" >
-            {{ 'moderate.elements.action.delete'|trans({}, 'adminui') }}
-          </a>
-            -
-          <a class="clean" href="{{ path('moderate_element_clean', {'element_id':element.id}) }}" >
-             {{ 'moderate.elements.action.clean'|trans({}, 'adminui') }}
-          </a>
-        </div>
-        
-        <div class="element">
-          <ul>
-            <li><strong>Name</strong>: {{ element.name }}</li>
-            <li><strong>url</strong>: <a href="{{ element.url }}" target="_blank">{{ element.url }}</a></li>
-            {#% if element.embed %}
-              {% autoescape false %}
-                <li>
-                  {{ element.embed }}
-                </li>
-              {% endautoescape %}
-            {% endif %#}
-          </ul>
-        </div>
-        
-      </li>
-    {% endfor %}
-  </ul>
-
-{% endblock %}

src/Muzich/AdminBundle/Resources/views/Moderate/index.html.twig

@@ -1,39 +0,0 @@
-{% extends "MuzichAdminBundle:Moderate:layout.html.twig" %}
-
-{% block title %}{% endblock %}
-
-{% block content %}
-
-  <h2>{{ 'moderate.title'|trans({}, 'adminui') }}</h2>
-  
-  <h3>{{ 'moderate.tags.title'|trans({}, 'adminui') }}</h3>
-  
-  <ul>
-    <li>
-      <a href="{{ path('MuzichAdminBundle_moderate_tags') }}">
-        {{ 'moderate.tags.to_moderate'|trans({'%count%' : count_tags}, 'adminui') }}
-      </a>
-    </li>
-  </ul>
-  
-  <h3>{{ 'moderate.elements.title'|trans({}, 'adminui') }}</h3>
-  
-  <ul>
-    <li>
-      <a href="{{ path('moderate_elements_index') }}">
-        {{ 'moderate.elements.to_moderate'|trans({'%count%' : count_elements}, 'adminui') }}
-      </a>
-    </li>
-  </ul>
-  
-  <h3>{{ 'moderate.comments.title'|trans({}, 'adminui') }}</h3>
-  
-  <ul>
-    <li>
-      <a href="{{ path('moderate_comments_index') }}">
-        {{ 'moderate.comments.to_moderate'|trans({'%count%' : count_comments}, 'adminui') }}
-      </a>
-    </li>
-  </ul>
-  
-{% endblock %}

src/Muzich/AdminBundle/Resources/views/Moderate/layout.html.twig

@@ -1,14 +0,0 @@
-{% extends 'MuzichCoreBundle::layout.html.twig' %}
-
-{% block css %}
-  <link href="{{ asset('bundles/muzichmoderate/css/moderate.css') }}" rel="stylesheet" media="screen" type="text/css" />
-{% endblock %}
-{% block js %}
-  <script src="{{ asset('bundles/muzichmoderate/js/moderate.js') }}" type="text/javascript"></script>
-{% endblock %}
-
-{% block main_content %}
-  
-  {% block content %}{% endblock %}
-  
-{% endblock %}

src/Muzich/AdminBundle/Resources/views/Moderate/tags.html.twig

@@ -1,44 +0,0 @@
-{% extends "MuzichAdminBundle:Moderate:layout.html.twig" %}
-
-{% block title %}{% endblock %}
-
-{% block content %}
-
-  <h2>{{ 'moderate.tags.title'|trans({}, 'adminui') }}</h2>
-    
-  <ul id="moderate_tags">
-    {% for tag in tags %}
-      <li class="tag">
-        <a href="{{ path('MuzichAdminBundle_moderate_tags_accept_tag', {'tag_id' : tag.id}) }}" class="accept">
-         [V]
-        </a>
-        <a href="{{ path('MuzichAdminBundle_moderate_tags_refuse_tag', {'tag_id' : tag.id}) }}" class="refuse">
-         [X]
-        </a>
-        <a href="{{ path('MuzichAdminBundle_moderate_tags_replace_tag', {
-          'tag_id' : tag.id
-        }) }}" class="replace">
-         [R]
-        </a>
-        <span class="name">
-          {{ tag.name }}
-        </span>
-          
-        <form action="#" name="moderate_tag_{{ tag.id }}">
-          {% include "MuzichCoreBundle:Tag:tagsPrompt.html.twig" with { 
-            'form_name'     : 'moderate_tag_' ~ tag.id 
-          } %}
-            
-            <input type="hidden" class="tagBox_tags_ids" name="tagBox_tags_ids" />
-            
-        </form>
-          
-        <p>
-          {{ tag.arguments }}
-        </p>
-          
-      </li>
-    {% endfor %}
-  </ul>
-
-{% endblock %}

src/Muzich/AdminBundle/Tests/Controller/DefaultControllerTest.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace Muzich\AdminBundle\Tests\Controller;
-
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-
-class DefaultControllerTest extends WebTestCase
-{
-    public function testIndex()
-    {
-        $client = static::createClient();
-
-        $crawler = $client->request('GET', '/hello/Fabien');
-
-        $this->assertTrue($crawler->filter('html:contains("Hello Fabien")')->count() > 0);
-    }
-}

src/Muzich/CoreBundle/Admin/ElementAdmin.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace Muzich\CoreBundle\Admin;
-
-use Sonata\AdminBundle\Admin\Admin;
-use Sonata\AdminBundle\Form\FormMapper;
-use Sonata\AdminBundle\Datagrid\DatagridMapper;
-use Sonata\AdminBundle\Datagrid\ListMapper;
-use Sonata\AdminBundle\Show\ShowMapper;
-
-class ElementAdmin extends Admin
-{
-  
-  protected $baseRouteName = 'elements_admin';
-  
-  protected function configureListFields(ListMapper $listMapper)
-  {
-    $listMapper
-      ->addIdentifier('id')
-      ->add('name')
-      ->add('url')
-
-      // add custom action links
-      ->add('_action', 'actions', array(
-        'actions' => array(
-          'view' => array(),
-          'edit' => array(),
-        )
-      ))
-    ;
-  }
-  
-  protected function configureDatagridFilters(DatagridMapper $datagrid)
-  {
-    $datagrid
-      ->add('name')
-      ->add('url')
-      ->add('tags', null, array('label' => 'les tags'), null, array('expanded' => true, 'multiple' => true))
-    ;
-  }
-  
-}
-
-?>

src/Muzich/CoreBundle/Controller/CoreController.php

@@ -34,7 +34,7 @@ class CoreController extends Controller
   {
     if($language != null)
     {
-      $old = $this->get('session')->getLocale();
+      $old = $this->container->get('request')->getLocale();
       $this->get('session')->setLocale($language);
     }
     
@@ -241,7 +241,7 @@ class CoreController extends Controller
     $element = new Element();
     $element->setType('none');
     $form = $this->getAddForm($element);
-    $form->bindRequest($this->getRequest());
+    $form->bind($this->getRequest());
         
     if ($form->isValid())
     {

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -128,7 +128,7 @@ class ElementController extends Controller
     $group = $element->getGroup();
     $element->setGroup(null);
     $form = $this->getAddForm($element);
-    $form->bindRequest($this->getRequest());
+    $form->bind($this->getRequest());
     
     $errors = array();
     $html = '';
@@ -344,7 +344,7 @@ class ElementController extends Controller
      */
     $es = $this->getElementSearcher(null, true);
     $search_form = $this->getSearchForm($es);
-    $search_form->bindRequest($this->getRequest());
+    $search_form->bind($this->getRequest());
     
     if ($search_form->isValid())
     {
@@ -397,7 +397,7 @@ class ElementController extends Controller
      */
     $es = $this->getElementSearcher(null, true);
     $search_form = $this->getSearchForm($es);
-    $search_form->bindRequest($this->getRequest());
+    $search_form->bind($this->getRequest());
     
     if ($search_form->isValid())
     {

src/Muzich/CoreBundle/Controller/SearchController.php

@@ -78,7 +78,7 @@ class SearchController extends Controller
     if ($request->getMethod() == 'POST')
     {
       $form_submited = true;
-      $search_form->bindRequest($request);
+      $search_form->bind($request);
       // Si le formulaire est valide
       if ($search_form->isValid())
       {
@@ -356,7 +356,7 @@ class SearchController extends Controller
     
     if ($request->getMethod() == 'POST')
     {
-      $form->bindRequest($request);
+      $form->bind($request);
       if ($form->isValid())
       {
         $results = $searcher->getResults(

src/Muzich/CoreBundle/Entity/Element.php

@@ -93,7 +93,7 @@ class Element
    * 
    * @ORM\Column(type="string", length=64)
    * @Assert\NotBlank()
-   * @Assert\MaxLength(1024)
+   * @Assert\Length(max = 255)
    */
   protected $type;
   
@@ -168,7 +168,7 @@ class Element
    * 
    * @ORM\Column(type="string", length=1024)
    * @Assert\NotBlank(message = "error.element.url.notblank")
-   * @Assert\MaxLength(limit = 1024, message = "error.element.url.tolong")
+   * @Assert\Length(max = 1024, maxMessage="error.element.url.tolong")
    * @Assert\Url(message = "error.element.url.invalid")
    * @var type string
    */
@@ -179,8 +179,7 @@ class Element
    * 
    * @ORM\Column(type = "string", length = 128)
    * @Assert\NotBlank(message = "error.element.name.notblank")
-   * @Assert\MinLength(limit = 3, message = "error.element.name.toshort")
-   * @Assert\MaxLength(limit = 64, message = "error.element.name.tolong")
+   * @Assert\Length(min = 3, max = 84, minMessage = "error.element.name.toshort", maxMessage = "error.element.name.tolong")
    * @var type string
    */
   protected $name;

src/Muzich/CoreBundle/Entity/Group.php

@@ -38,8 +38,7 @@ class Group
    * 
    * @ORM\Column(type="string", length=128, unique=true)
    * @Assert\NotBlank()
-   * @Assert\MinLength(limit=3)
-   * @Assert\MaxLength(64)
+   * @Assert\Length(min = 3, max = 64)
    * @var type string
    */
   protected $name;
@@ -54,7 +53,7 @@ class Group
    * Description
    * 
    * @ORM\Column(type="text", nullable=true)
-   * @Assert\MaxLength(2048)
+   * @Assert\Length(max = 4096)
    * @var type string
    */
   protected $description;

src/Muzich/CoreBundle/Entity/RegistrationToken.php

@@ -29,8 +29,7 @@ class RegistrationToken
    * 
    * @ORM\Column(type="string", length=32, unique=true)
    * @Assert\NotBlank()
-   * @Assert\MinLength(limit=3)
-   * @Assert\MaxLength(32)
+   * @Assert\Length(min = 3, max = 32)
    * @var type string
    */
   protected $token;

src/Muzich/CoreBundle/Entity/User.php

@@ -640,7 +640,7 @@ class User extends BaseUser
 //  }
   
 //  /**
-//  * @ORM\prePersist
+//  * @ORM\PrePersist
 //  */
 //  public function setSlug()
 //  {
@@ -672,7 +672,7 @@ class User extends BaseUser
   /**
    * Retourn si l'user_id transmis est l'un des User suivis
    * 
-   * @param Symfony\Bundle\DoctrineBundle\Registry doctrine
+   * @param Doctrine\Bundle\DoctrineBundle\Registry doctrine
    * @param int $user_id 
    * @return boolean
    */
@@ -687,7 +687,7 @@ class User extends BaseUser
   /**
    * Retourn si l'group_id transmis est l'un des groupe suivis
    * 
-   * @param Symfony\Bundle\DoctrineBundle\Registry doctrine
+   * @param Doctrine\Bundle\DoctrineBundle\Registry doctrine
    * @param int $user_id 
    * @return boolean
    */

src/Muzich/CoreBundle/Entity/UsersTagsFavorites.php

@@ -121,7 +121,7 @@ class UsersTagsFavorites
   }
   
   /**
-   * @ORM\prePersist
+   * @ORM\PrePersist
    */
   public function prePersist()
   {
@@ -129,7 +129,7 @@ class UsersTagsFavorites
   }
   
   /**
-   * @ORM\preRemove
+   * @ORM\PreRemove
    */
   public function preRemove()
   {

src/Muzich/CoreBundle/Extension/MyTwigExtension.php

@@ -196,7 +196,7 @@ class MyTwigExtension extends \Twig_Extension {
   {
     $form_vars = $form->getVars();
     $count_error = count($form_vars['errors']);
-    foreach ($form->getChildren() as $form_children)
+    foreach ($form as $form_children)
     {
       $form_children_vars = $form_children->getVars();
       $count_error += count($form_children_vars['errors']);

src/Muzich/CoreBundle/Form/Element/ElementAddForm.php

@@ -3,13 +3,14 @@
 namespace Muzich\CoreBundle\Form\Element;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 class ElementAddForm extends AbstractType
 {
   private $name = null;
   
-  public function buildForm(FormBuilder $builder, array $options)
+  public function buildForm(FormBuilderInterface $builder, array $options)
   {    
     $builder->add('name', 'text', array(
       'required' => true,
@@ -44,15 +45,18 @@ class ElementAddForm extends AbstractType
     return 'element_add';
   }
   
-  public function getDefaultOptions(array $options)
+  public function setDefaultOptions(OptionsResolverInterface $resolver)
   {
-    return array(
+    $resolver->setDefaults(array(
       'name' => '',
       'url' => '',
       'tags' => '',
       'need_tags' => false,
-      //'groups' => array(),
-      'data_class' => 'Muzich\CoreBundle\Entity\Element'
-    );
+      //'data_class' => 'Muzich\CoreBundle\Entity\Element'
+    ));
+  
+    $resolver->setAllowedValues(array(
+      'need_tags'       => array(true, false)
+    ));
   }
 }

src/Muzich/CoreBundle/Form/Group/GroupForm.php

@@ -3,11 +3,12 @@
 namespace Muzich\CoreBundle\Form\Group;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 class GroupForm extends AbstractType
 {
-  public function buildForm(FormBuilder $builder, array $options)
+  public function buildForm(FormBuilderInterface $builder, array $options)
   {
     $builder->add('name', 'text', array(
       'required' => true,
@@ -29,14 +30,18 @@ class GroupForm extends AbstractType
     return 'group';
   }
   
-  public function getDefaultOptions(array $options)
+  public function setDefaultOptions(OptionsResolverInterface $resolver)
   {
-    return array(
-      'name' => '',
-      'open' => true,
-      'tags' => '',
-      'data_class' => 'Muzich\CoreBundle\Entity\Group'
-    );
+    $resolver->setDefaults(array(
+      'name'       => '',
+      'open'       => true,
+      'tags'       => '',
+      //'data_class' => 'Muzich\CoreBundle\Entity\Group'
+    ));
+  
+    $resolver->setAllowedValues(array(
+      'open'       => array(true, false)
+    ));
   }
 }
 

src/Muzich/CoreBundle/Form/Search/ElementSearchForm.php

@@ -3,12 +3,13 @@
 namespace Muzich\CoreBundle\Form\Search;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
 use Muzich\CoreBundle\Searcher\ElementSearcher;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 class ElementSearchForm extends AbstractType
 {
-  public function buildForm(FormBuilder $builder, array $options)
+  public function buildForm(FormBuilderInterface $builder, array $options)
   {
     $builder->add('network', 'choice', array(
       'choices' => array(
@@ -30,10 +31,11 @@ class ElementSearchForm extends AbstractType
     return 'element_search_form';
   }
   
-  public function getDefaultOptions(array $options)
+  public function setDefaultOptions(OptionsResolverInterface $resolver)
   {
-    return array(
-      'tags' => ''
-    );
+    $resolver->setDefaults(array(
+      'tags'       => '',
+      //'data_class' => null
+    ));
   }
 }

src/Muzich/CoreBundle/Form/Tag/TagFavoritesForm.php

@@ -3,11 +3,12 @@
 namespace Muzich\CoreBundle\Form\Tag;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 class TagFavoritesForm extends AbstractType
 {
-  public function buildForm(FormBuilder $builder, array $options)
+  public function buildForm(FormBuilderInterface $builder, array $options)
   {    
     $builder->add('tags', 'hidden');
   }
@@ -17,10 +18,11 @@ class TagFavoritesForm extends AbstractType
     return 'tag_favorites_form';
   }
   
-  public function getDefaultOptions(array $options)
+  public function setDefaultOptions(OptionsResolverInterface $resolver)
   {
-    return array(
-      'tags' => '',
-    );
+    $resolver->setDefaults(array(
+      'tags'       => '',
+      //'data_class' => null
+    ));
   }
 }

src/Muzich/CoreBundle/Managers/TagManager.php

@@ -6,7 +6,7 @@ use Muzich\CoreBundle\Entity\Tag;
 use Doctrine\ORM\EntityManager;
 use Symfony\Component\DependencyInjection\Container;
 use FOS\UserBundle\Util\CanonicalizerInterface;
-use Symfony\Bundle\DoctrineBundle\Registry;
+use Doctrine\Bundle\DoctrineBundle\Registry;
 use Muzich\CoreBundle\Util\StrictCanonicalizer;
 use Muzich\CoreBundle\Entity\UsersTagsFavorites;
 use Muzich\CoreBundle\Entity\GroupsTagsFavorites;
@@ -180,7 +180,7 @@ class TagManager
   
   /**
    * 
-   * @param \Symfony\Bundle\DoctrineBundle\Registry $doctrine
+   * @param \Doctrine\Bundle\DoctrineBundle\Registry $doctrine
    * @param \Muzich\CoreBundle\Entity\Tag $tag
    * @param type $accept
    * @param type $replacing_id

src/Muzich/CoreBundle/Resources/config/security.yml

@@ -1,11 +1,16 @@
 parameters:
     # ... other parameters
-    security.acl.permission.map.class: Sonata\AdminBundle\Security\Acl\Permission\AdminPermissionMap
+    #security.acl.permission.map.class: Sonata\AdminBundle\Security\Acl\Permission\AdminPermissionMap
     
 security:
     providers:
         fos_userbundle:
             id: fos_user.user_manager
+    encoders:
+        "FOS\UserBundle\Model\UserInterface":
+            algorithm: sha512
+            encode_as_base64: false
+            iterations: 1
 
     firewalls:
         main:
@@ -36,7 +41,8 @@ security:
         
     role_hierarchy:
         ROLE_ADMIN:       ROLE_USER
-        ROLE_SUPER_ADMIN: [ROLE_ADMIN, ROLE_SONATA_ADMIN, ROLE_ALLOWED_TO_SWITCH]
+        #ROLE_SUPER_ADMIN: [ROLE_ADMIN, ROLE_SONATA_ADMIN, ROLE_ALLOWED_TO_SWITCH]
+        ROLE_SUPER_ADMIN: [ROLE_ADMIN, ROLE_ALLOWED_TO_SWITCH]
         
     acl:
         connection: default
@@ -66,6 +72,7 @@ security:
         
         - { path: ^/login$, role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/login_check$, role: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/logout$, role: IS_AUTHENTICATED_ANONYMOUSLY }
         
         ## Ouvert pour l'ajax (et le message de redirection en cas de déco)
         - { path: ^/(?:fr|en)/search-elements, role: IS_AUTHENTICATED_ANONYMOUSLY }

src/Muzich/CoreBundle/Resources/config/validation.yml

@@ -1,7 +0,0 @@
-##
-
-Muzich\CoreBundle\Entity\User:
-  properties:
-    username:
-      - MinLength: { limit: 3}
-      - MaxLength: { limit: 32}

src/Muzich/CoreBundle/Resources/views/Form/errors.html.twig

@@ -1,11 +1,24 @@
 {% block field_errors %}
 {% spaceless %}
-  {% if errors|length > 0 %}
-  <ul class="error_list">
-    {% for error in errors %}
-      <li>{{ error.messageTemplate|trans(error.messageParameters, 'validators') }}</li>
-    {% endfor %}
-  </ul>
+  
+  {% if compound %}
+    {# Edit du a migration to 2.1 #}
+      {% if errors|length > 0 %}
+      <ul class="error_list">
+        {% for error in errors %}
+          <li>{{ error.messageTemplate|trans(error.messageParameters, 'validators') }}</li>
+        {% endfor %}
+      </ul>
+      {% endif %}
+  {% else %}
+      {% if errors|length > 0 %}
+      <ul class="error_list">
+        {% for error in errors %}
+          <li>{{ error.messageTemplate|trans(error.messageParameters, 'validators') }}</li>
+        {% endfor %}
+      </ul>
   {% endif %}
+  {% endif %}
+  
 {% endspaceless %}
 {% endblock field_errors %}

src/Muzich/CoreBundle/Resources/views/Language/languages.html.twig

@@ -1,4 +1,4 @@
 <div id="languages">
-  <a {% if app.session.locale == 'fr' %}class="selected"{% endif %} href="{{ path('change_language', {'language' : 'fr'}) }}">FR</a>
-  <a {% if app.session.locale == 'en' %}class="selected"{% endif %} href="{{ path('change_language', {'language' : 'en'}) }}">EN</a>
+  <a {% if app.request.locale == 'fr' %}class="selected"{% endif %} href="{{ path('change_language', {'language' : 'fr'}) }}">FR</a>
+  <a {% if app.request.locale == 'en' %}class="selected"{% endif %} href="{{ path('change_language', {'language' : 'en'}) }}">EN</a>
 </div>

src/Muzich/CoreBundle/Resources/views/Layout/flash_messages.html.twig

@@ -1,16 +1,18 @@
-{% for key, flash in app.session.getFlashes() %}
-  <div class="{{ key }} message">
-    <a class="message-close" href="javascript:void(0);" title="fermer"><img alt="close" src="{{ asset('bundles/muzichcore/img/1317386146_cancel.png') }}" /></a>
-    <h3>{{ flash|trans({}, 'flash') }}</h3>
-  </div>
-
-  {% if key == 'success' %}
-  <script type="text/javascript" >
-    $(document).ready(function(){
-      window.setTimeout(function(){
-        $('div.success').slideUp();
-      }, 3000);
-    });
-  </script>
-  {% endif %}
+{% for key, flashMessages in app.session.flashbag.all() %}
+  {% for flashMessage in flashMessages %}
+    <div class="{{ key }} message">
+      <a class="message-close" href="javascript:void(0);" title="fermer"><img alt="close" src="{{ asset('bundles/muzichcore/img/1317386146_cancel.png') }}" /></a>
+      <h3>{{ flashMessage|trans({}, 'flash') }}</h3>
+    </div>
+  
+    {% if key == 'success' %}
+    <script type="text/javascript" >
+      $(document).ready(function(){
+        window.setTimeout(function(){
+          $('div.success').slideUp();
+        }, 3000);
+      });
+    </script>
+    {% endif %}
+  {% endfor %}
 {% endfor %}

src/Muzich/CoreBundle/Searcher/ElementSearcher.php

@@ -2,7 +2,7 @@
 
 namespace Muzich\CoreBundle\Searcher;
 
-use Symfony\Bundle\DoctrineBundle\Registry;
+use Doctrine\Bundle\DoctrineBundle\Registry;
 
 class ElementSearcher extends Searcher implements SearcherInterface
 {

src/Muzich/CoreBundle/Searcher/GlobalSearcher.php

@@ -3,7 +3,7 @@
 namespace Muzich\CoreBundle\Searcher;
 
 use Symfony\Component\Validator\Constraints as Assert;
-use Symfony\Bundle\DoctrineBundle\Registry;
+use Doctrine\Bundle\DoctrineBundle\Registry;
 use Muzich\CoreBundle\Searcher\UserAndGroupSearcher;
 use Muzich\CoreBundle\Searcher\ElementSearcher;
 
@@ -19,7 +19,7 @@ class GlobalSearcher extends Searcher implements SearcherInterface
    * @var string
    * @Assert\NotBlank()
    * @Assert\Type("string")
-   * @Assert\MinLength(3)
+   * @Assert\Length(min = 3)
    */
   protected $string;
     

src/Muzich/CoreBundle/Searcher/Searcher.php

@@ -3,7 +3,7 @@
 namespace Muzich\CoreBundle\Searcher;
 
 use Doctrine\ORM\Query;
-use Symfony\Bundle\DoctrineBundle\Registry;
+use Doctrine\Bundle\DoctrineBundle\Registry;
 
 /**
  * Objet utiliser pour cadrer la recherche.

src/Muzich/CoreBundle/Searcher/UserAndGroupSearcher.php

@@ -3,7 +3,7 @@
 namespace Muzich\CoreBundle\Searcher;
 
 use Symfony\Component\Validator\Constraints as Assert;
-use Symfony\Bundle\DoctrineBundle\Registry;
+use Doctrine\Bundle\DoctrineBundle\Registry;
 
 /**
  * Objet de recherche
@@ -17,7 +17,7 @@ class UserAndGroupSearcher extends Searcher implements SearcherInterface
    * @var string
    * @Assert\NotBlank()
    * @Assert\Type("string")
-   * @Assert\MinLength(3)
+   * @Assert\Length(min = 3)
    */
   protected $string;
     

src/Muzich/CoreBundle/Util/TagLike.php

@@ -2,7 +2,7 @@
 
 namespace Muzich\CoreBundle\Util;
 
-use Symfony\Bundle\DoctrineBundle\Registry;
+use Doctrine\Bundle\DoctrineBundle\Registry;
 use Muzich\CoreBundle\Util\StrictCanonicalizer;
 
 /**

src/Muzich/CoreBundle/Validator/GroupOwnedOrPublic.php

@@ -9,7 +9,7 @@ use Symfony\Component\Validator\Constraint;
  */
 class GroupOwnedOrPublic extends Constraint
 {
-  public $message = 'Le groupe est mal choisis';
+  public $message = 'group_malchoisis';
   public $entity;
   public $property;
 

src/Muzich/CoreBundle/Validator/GroupOwnedOrPublicValidator.php

@@ -39,13 +39,15 @@ class GroupOwnedOrPublicValidator extends ConstraintValidator
       ;
       if (!$group)
       {
-        $this->setMessage('Le groupe est invalide');
+        //$this->setMessage('Le groupe est invalide'); UPGRADE 2.1
+        $this->context->addViolation('group_invalid');
         return false;
       }
       
       if (!$group->userCanAddElement($user))
       {
-        $this->setMessage('Le groupe est invalide');
+        //$this->setMessage('Le groupe est invalide'); UPGRADE 2.1
+        $this->context->addViolation('group_invalid');
         return false;
       }
     }

src/Muzich/CoreBundle/Validator/TagsValidator.php

@@ -24,7 +24,8 @@ class TagsValidator extends ConstraintValidator
     {
       if (array_diff($value, array_unique($value)))
       {
-        $this->setMessage('Tags saisies incorrects');
+        //$this->setMessage('Tags saisies incorrects');UPGRADE 2.1
+        $this->context->addViolation('tags_saisinco');
         return false;
       }
 
@@ -37,7 +38,8 @@ class TagsValidator extends ConstraintValidator
 
       if ($count != count ($value))
       {
-        $this->setMessage('Tags saisies incorrects');
+        //$this->setMessage('Tags saisies incorrects');UPGRADE 2.1
+        $this->context->addViolation('tags_saisinco');
         return false;
       }
     }

src/Muzich/CoreBundle/lib/Controller.php

@@ -47,7 +47,7 @@ class Controller extends BaseController
   }
   
   /**
-   * @desc Retourn l'objet ElementSearcher en cours.
+   * Retourn l'objet ElementSearcher en cours.
    * 
    * @param int $count Si renseigné impact le nombre d'éléments qui seront 
    * récupérés
@@ -117,7 +117,7 @@ class Controller extends BaseController
    * @param boolean $force_refresh
    * @return \Muzich\CoreBundle\Entity\User 
    */
-  protected function getUser($personal_query = false, $params = array(), $force_refresh = false)
+  public function getUser($personal_query = false, $params = array(), $force_refresh = false)
   {
     if (!$personal_query)
     {
@@ -153,7 +153,7 @@ class Controller extends BaseController
   }
   
   /**
-   * @desc Retourne l'id de l'utilisateur en cours
+   *  Retourne l'id de l'utilisateur en cours
    */
   protected function getUserId()
   {
@@ -329,13 +329,17 @@ class Controller extends BaseController
    */
   protected function getAddForm($element = array(), $name = null)
   {
+    //$form = new ElementAddForm();
+    //$form->setName($name);
+    //return $this->createForm(
+    //  $form,
+    //  $element,
+    //  array()
+    //);
+  
     $form = new ElementAddForm();
     $form->setName($name);
-    return $this->createForm(
-      $form,
-      $element,
-      array()
-    );
+    return $this->createForm($form, $element);
   }
   
   /**
@@ -403,7 +407,7 @@ class Controller extends BaseController
     
     if ($this->getUser() == 'anon.')
     {
-      $this->setFlash('info', 'user.session_expired');
+      $this->setFlash('error', 'user.session_expired');
       
       if ($this->getRequest()->isXmlHttpRequest())
       {

src/Muzich/CoreBundle/lib/FunctionalTest.php

@@ -145,7 +145,7 @@ class FunctionalTest extends WebTestCase
       $pass2,
       $token
     );
-    $this->outputDebug();
+    
     $this->isResponseRedirection();
     $this->followRedirection();
     $this->isResponseSuccess();
@@ -326,7 +326,7 @@ class FunctionalTest extends WebTestCase
 
   /**
    *
-   * @return \Symfony\Bundle\DoctrineBundle\Registry
+   * @return \Doctrine\Bundle\DoctrineBundle\Registry
    */
   protected function getDoctrine()
   {

src/Muzich/CoreBundle/lib/Tag.php

@@ -51,7 +51,7 @@ class Tag
   }
   
   /**
-   * @desc Range une liste de tags [0 => Tag] en fonction d'une
+   * Range une liste de tags [0 => Tag] en fonction d'une
    * réfèrence sous la forme [0 => tag_id, 1 => tag_id]
    * 
    * @param array $tags

src/Muzich/CoreBundle/lib/UnitTest.php

@@ -25,7 +25,7 @@ class UnitTest extends \PHPUnit_Framework_TestCase
   
   /**
    *
-   * @return \Symfony\Bundle\DoctrineBundle\Registry
+   * @return \Doctrine\Bundle\DoctrineBundle\Registry
    */
   protected function getDoctrine()
   {

src/Muzich/GroupBundle/Controller/DefaultController.php

@@ -71,7 +71,7 @@ class DefaultController extends Controller
     $new_group->setOwner($user);
     $form_new = $this->getGroupForm($new_group);
     
-    $form_new->bindRequest($request);
+    $form_new->bind($request);
     
     if ($form_new->isValid())
     {
@@ -171,7 +171,7 @@ class DefaultController extends Controller
     $group->setTags($group->getTagsIdsJson());
     $form = $this->getGroupForm($group);
     
-    $form->bindRequest($request);
+    $form->bind($request);
     
     if ($form->isValid())
     {

src/Muzich/IndexBundle/Controller/IndexController.php

@@ -44,7 +44,7 @@ class IndexController extends Controller
     $request = $this->container->get('request');
     /* @var $request \Symfony\Component\HttpFoundation\Request */
     $session = $request->getSession();
-    /* @var $session \Symfony\Component\HttpFoundation\Session */
+    /* @var $session Symfony\Component\HttpFoundation\Session\Session */
 
     // get the error if any (works with forward and redirect -- see below)
     if ($request->attributes->has(SecurityContext::AUTHENTICATION_ERROR)) {
@@ -73,7 +73,7 @@ class IndexController extends Controller
   public function presubscriptionAction(Request $request)
   {
     $form = $this->getPreSubscriptionForm();
-    $form->bindRequest($request);
+    $form->bind($request);
     if ($form->isValid())
     {
       $this->persist($form->getData());

src/Muzich/UserBundle/Controller/UserController.php

@@ -24,7 +24,8 @@ class UserController extends Controller
     ));
     
     return $this->createFormBuilder(null, array(
-      'validation_constraint' => $collectionConstraint,
+      //'validation_constraint' => $collectionConstraint, UPGRADE 2.1
+      'constraints' => $collectionConstraint,
     ))
       ->add('email', 'text')
       ->getForm()
@@ -139,7 +140,7 @@ class UserController extends Controller
   protected function checkRegistrationInformations($form)
   {
     $errors = array();
-    $form->bindRequest($this->getRequest());
+    $form->bind($this->getRequest());
     $form_values = $this->getRequest()->request->get($form->getName());
     $user = $form->getData();
     
@@ -225,7 +226,7 @@ class UserController extends Controller
     }
     else
     {
-      $form->bindRequest($this->getRequest());
+      $form->bind($this->getRequest());
       $errors[] = $this->get('translator')->trans(
         'registration.token.error', 
         array(),
@@ -371,7 +372,7 @@ class UserController extends Controller
     
     if ($request->getMethod() == 'POST')
     {
-      $form->bindRequest($request);
+      $form->bind($request);
       if ($form->isValid())
       {
         $data = $form->getData();
@@ -442,7 +443,7 @@ class UserController extends Controller
     $request = $this->getRequest();
     $change_email_form = $this->getChangeEmailForm();
     
-    $change_email_form->bindRequest($request);
+    $change_email_form->bind($request);
     if ($change_email_form->isValid())
     {
       $data = $change_email_form->getData();
@@ -462,7 +463,11 @@ class UserController extends Controller
       // On renseigne en base l'email demandé
       $user->setEmailRequested($email);
       $user->setEmailRequestedDatetime(time());
-      $user->generateConfirmationToken();
+      
+      //$user->generateConfirmationToken(); UPGRADE FOSUserBundle 1.3
+      $tokenGenerator = $this->container->get('fos_user.util.token_generator');
+      $user->setConfirmationToken($tokenGenerator->generateToken());
+      
       $token = hash('sha256', $user->getConfirmationToken().$email);
       $url = $this->get('router')->generate('change_email_confirm', array('token' => $token), true);
       $rendered = $this->get('templating')->render('MuzichUserBundle:User:change_email_mail.txt.twig', array(
@@ -486,7 +491,7 @@ class UserController extends Controller
       $mailer = $this->get('mailer');
       $mailer->send($message);
       
-      $this->setFlash('info', 'user.changeemail.mail_send');
+      $this->setFlash('success', 'user.changeemail.mail_send');
       $em->flush();
       return new RedirectResponse($this->generateUrl('my_account'));
     }
@@ -613,7 +618,7 @@ class UserController extends Controller
   public function updateAvatarAction(Request $request)
   {
     $form = $this->getAvatarForm();
-    $form->bindRequest($request);
+    $form->bind($request);
     
     if ($form->isValid()) {
       $em = $this->getEntityManager();
@@ -635,7 +640,7 @@ class UserController extends Controller
   public function updatePreferencesAction(Request $request)
   {
     $form = $this->getPreferencesForm();
-    $form->bindRequest($request);
+    $form->bind($request);
     
     if ($form->isValid()) {
       $em = $this->getEntityManager();

src/Muzich/UserBundle/Entity/UserManager.php

@@ -9,7 +9,8 @@ namespace Muzich\UserBundle\Entity;
 use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
 use FOS\UserBundle\Util\CanonicalizerInterface;
 use Doctrine\ORM\EntityManager;
-use FOS\UserBundle\Entity\UserManager as UserManagerBase;
+//use FOS\UserBundle\Entity\UserManager as UserManagerBase; UPGRADE FOSUserBundle 1.3
+use FOS\UserBundle\Doctrine\UserManager as UserManagerBase;
 
 /**
  */
@@ -29,7 +30,7 @@ class UserManager extends UserManagerBase
     $evm->addEventSubscriber($sluggableListener);
     // now this event manager should be passed to entity manager constructor
 
-    $this->em->getEventManager()->addEventSubscriber($sluggableListener);
+    $this->objectManager->getEventManager()->addEventSubscriber($sluggableListener);
   }
 
 }

src/Muzich/UserBundle/Form/Type/RegistrationFormType.php

@@ -2,17 +2,18 @@
 
 namespace Muzich\UserBundle\Form\Type;
 
-use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
 use FOS\UserBundle\Form\Type\RegistrationFormType as BaseType;
 
 class RegistrationFormType extends BaseType
 {
-  public function buildForm(FormBuilder $builder, array $options)
+  public function buildForm(FormBuilderInterface $builder, array $options)
   {
     parent::buildForm($builder, $options);
 
     $builder->add('token', 'text', array(
-      "property_path" => false
+      //"property_path" => false UPGRADE 2.1
+      'mapped' => false,
     ));
     
     $builder->add('cgu_accepted', 'checkbox', array(

src/Muzich/UserBundle/Resources/views/Security/change_password_form.html.twig

@@ -11,9 +11,9 @@
 {% endif %}
     
   <div class="field">
-    {{ form_errors(form.current) }}
-    {{ form_label(form.current, 'password.actual'|trans({}, 'userform')) }}
-    {{ form_widget(form.current, {'attr':{'class':'niceinput'}}) }}
+    {{ form_errors(form.current_password) }}
+    {{ form_label(form.current_password, 'password.actual'|trans({}, 'userform')) }}
+    {{ form_widget(form.current_password, {'attr':{'class':'niceinput'}}) }}
   </div>
 
   <div class="field">

src/Muzich/UserBundle/Resources/views/User/preference_form.html.twig

@@ -1,14 +1,14 @@
 
 <div class="field">
   {{ form_errors(form.mail_newsletter) }}
-  {{ form_label(form.mail_newsletter, '') }}
+  {{ form_label(form.mail_newsletter, '-') }}
   {{ form_widget(form.mail_newsletter, {'attr':{}}) }}
   {{ 'mail_newsletter'|trans({}, 'userform') }}
 </div>
 
 <div class="field">
   {{ form_errors(form.mail_partner) }}
-  {{ form_label(form.mail_partner, '') }}
+  {{ form_label(form.mail_partner, '-') }}
   {{ form_widget(form.mail_partner, {'attr':{}}) }}
   {{ 'mail_partner'|trans({}, 'userform') }}
 </div> 

vendor/assetic/.gitignore

@@ -1,2 +0,0 @@
-phpunit.xml
-vendor/

vendor/assetic/.travis.yml

@@ -1,13 +0,0 @@
-language: php
-
-php:
-    - 5.3
-    - 5.4
-
-before_script:
-    - git clone https://github.com/kamicane/packager.git vendor/packager --quiet --depth 1
-    - git clone https://github.com/leafo/lessphp.git vendor/lessphp --quiet --depth 1
-    - git clone https://github.com/fabpot/Twig.git vendor/twig --quiet --depth 1
-    - svn checkout http://cssmin.googlecode.com/svn/trunk/ vendor/cssmin --quiet
-
-script: phpunit --configuration phpunit.travis.xml

vendor/assetic/CHANGELOG-1.0.md

@@ -1,36 +0,0 @@
-1.0.4 (August 28, 2012)
------------------------
-
- * Fixed the Twig tag to avoid a fatal error when left unclosed
- * Added the HashableInterface for non-serialiable filters
- * Fixed a bug for compass on windows
-
-1.0.3 (March 2, 2012)
----------------------
-
- * Added "boring" option to Compass filter
- * Fixed accumulation of load paths in Compass filter
- * Fixed issues in CssImport and CssRewrite filters
-
-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)
----------------------
-
- * Fixed Twig error handling
- * Removed use of STDIN
- * Added inheritance of environment variables
- * Fixed Compass on Windows
- * Improved escaping of commands
-
-1.0.0 (July 10, 2011)
----------------------
-
- * Initial release

vendor/assetic/README.md

@@ -1,283 +0,0 @@
-# Assetic ![project status](http://stillmaintained.com/kriswallsmith/assetic.png) #
-
-Assetic is an asset management framework for PHP.
-
-``` php
-<?php
-
-use Assetic\Asset\AssetCollection;
-use Assetic\Asset\FileAsset;
-use Assetic\Asset\GlobAsset;
-
-$js = new AssetCollection(array(
-    new GlobAsset('/path/to/js/*'),
-    new FileAsset('/path/to/another.js'),
-));
-
-// the code is merged when the asset is dumped
-echo $js->dump();
-```
-
-Assets
-------
-
-An Assetic asset is something with filterable content that can be loaded and
-dumped. An asset also includes metadata, some of which can be manipulated and
-some of which is immutable.
-
-| **Property** | **Accessor**    | **Mutator**   |
-|--------------|-----------------|---------------|
-| content      | getContent      | setContent    |
-| mtime        | getLastModified | n/a           |
-| source root  | getSourceRoot   | n/a           |
-| source path  | getSourcePath   | n/a           |
-| target path  | getTargetPath   | setTargetPath |
-
-Filters
--------
-
-Filters can be applied to manipulate assets.
-
-``` php
-<?php
-
-use Assetic\Asset\AssetCollection;
-use Assetic\Asset\FileAsset;
-use Assetic\Asset\GlobAsset;
-use Assetic\Filter\LessFilter;
-use Assetic\Filter\Yui;
-
-$css = new AssetCollection(array(
-    new FileAsset('/path/to/src/styles.less', array(new LessFilter())),
-    new GlobAsset('/path/to/css/*'),
-), array(
-    new Yui\CssCompressorFilter('/path/to/yuicompressor.jar'),
-));
-
-// this will echo CSS compiled by LESS and compressed by YUI
-echo $css->dump();
-```
-
-The filters applied to the collection will cascade to each asset leaf if you
-iterate over it.
-
-``` php
-<?php
-
-foreach ($css as $leaf) {
-    // each leaf is compressed by YUI
-    echo $leaf->dump();
-}
-```
-
-The core provides the following filters in the `Assetic\Filter` namespace:
-
- * `CoffeeScriptFilter`: compiles CoffeeScript into Javascript
- * `CssEmbedFilter`: embeds image data in your stylesheets
- * `CssImportFilter`: inlines imported stylesheets
- * `CssMinFilter`: minifies CSS
- * `CssRewriteFilter`: fixes relative URLs in CSS assets when moving to a new URL
- * `GoogleClosure\CompilerApiFilter`: compiles Javascript using the Google Closure Compiler API
- * `GoogleClosure\CompilerJarFilter`: compiles Javascript using the Google Closure Compiler JAR
- * `JpegoptimFilter`: optimize your JPEGs
- * `JpegtranFilter`: optimize your JPEGs
- * `LessFilter`: parses LESS into CSS (using less.js with node.js)
- * `LessphpFilter`: parses LESS into CSS (using lessphp)
- * `OptiPngFilter`: optimize your PNGs
- * `PngoutFilter`: optimize your PNGs
- * `CompassFilter`: Compass CSS authoring framework
- * `Sass\SassFilter`: parses SASS into CSS
- * `Sass\ScssFilter`: parses SCSS into CSS
- * `SprocketsFilter`: Sprockets Javascript dependency management
- * `StylusFilter`: parses STYL into CSS
- * `Yui\CssCompressorFilter`: compresses CSS using the YUI compressor
- * `Yui\JsCompressorFilter`: compresses Javascript using the YUI compressor
-
-Asset Manager
--------------
-
-An asset manager is provided for organizing assets.
-
-``` php
-<?php
-
-use Assetic\AssetManager;
-use Assetic\Asset\FileAsset;
-use Assetic\Asset\GlobAsset;
-
-$am = new AssetManager();
-$am->set('jquery', new FileAsset('/path/to/jquery.js'));
-$am->set('base_css', new GlobAsset('/path/to/css/*'));
-```
-
-The asset manager can also be used to reference assets to avoid duplication.
-
-``` php
-<?php
-
-use Assetic\Asset\AssetCollection;
-use Assetic\Asset\AssetReference;
-use Assetic\Asset\FileAsset;
-
-$am->set('my_plugin', new AssetCollection(array(
-    new AssetReference($am, 'jquery'),
-    new FileAsset('/path/to/jquery.plugin.js'),
-)));
-```
-
-Filter Manager
---------------
-
-A filter manager is also provided for organizing filters.
-
-``` php
-<?php
-
-use Assetic\FilterManager;
-use Assetic\Filter\Sass\SassFilter;
-use Assetic\Filter\Yui;
-
-$fm = new FilterManager();
-$fm->set('sass', new SassFilter('/path/to/parser/sass'));
-$fm->set('yui_css', new Yui\CssCompressorFilter('/path/to/yuicompressor.jar'));
-```
-
-Asset Factory
--------------
-
-If you'd rather not create all these objects by hand, you can use the asset
-factory, which will do most of the work for you.
-
-``` php
-<?php
-
-use Assetic\Factory\AssetFactory;
-
-$factory = new AssetFactory('/path/to/asset/directory/');
-$factory->setAssetManager($am);
-$factory->setFilterManager($fm);
-$factory->setDebug(true);
-
-$css = $factory->createAsset(array(
-    '@reset',         // load the asset manager's "reset" asset
-    'css/src/*.scss', // load every scss files from "/path/to/asset/directory/css/src/"
-), array(
-    'scss',           // filter through the filter manager's "scss" filter
-    '?yui_css',       // don't use this filter in debug mode
-));
-
-echo $css->dump();
-```
-
-Prefixing a filter name with a question mark, as `yui_css` is here, will cause
-that filter to be omitted when the factory is in debug mode.
-
-Caching
--------
-
-A simple caching mechanism is provided to avoid unnecessary work.
-
-``` php
-<?php
-
-use Assetic\Asset\AssetCache;
-use Assetic\Asset\FileAsset;
-use Assetic\Cache\FilesystemCache;
-use Assetic\Filter\Yui;
-
-$yui = new Yui\JsCompressorFilter('/path/to/yuicompressor.jar');
-$js = new AssetCache(
-    new FileAsset('/path/to/some.js', array($yui)),
-    new FilesystemCache('/path/to/cache')
-);
-
-// the YUI compressor will only run on the first call
-$js->dump();
-$js->dump();
-$js->dump();
-```
-
-Static Assets
--------------
-
-Alternatively you can just write filtered assets to your web directory and be
-done with it.
-
-``` php
-<?php
-
-use Assetic\AssetWriter;
-
-$writer = new AssetWriter('/path/to/web');
-$writer->writeManagerAssets($am);
-```
-
-Twig
-----
-
-To use the Assetic [Twig][3] extension you must register it to your Twig
-environment:
-
-``` php
-<?php
-
-$twig->addExtension(new AsseticExtension($factory, $debug));
-```
-
-Once in place, the extension exposes a stylesheets and a javascripts tag with a syntax similar
-to what the asset factory uses:
-
-``` html+jinja
-{% stylesheets '/path/to/sass/main.sass' filter='sass,?yui_css' output='css/all.css' %}
-    <link href="{{ asset_url }}" type="text/css" rel="stylesheet" />
-{% endstylesheets %}
-```
-
-This example will render one `link` element on the page that includes a URL
-where the filtered asset can be found.
-
-When the extension is in debug mode, this same tag will render multiple `link`
-elements, one for each asset referenced by the `css/src/*.sass` glob. The
-specified filters will still be applied, unless they are marked as optional
-using the `?` prefix.
-
-This behavior can also be triggered by setting a `debug` attribute on the tag:
-
-``` html+jinja
-{% stylesheets 'css/*' debug=true %} ... {% stylesheets %}
-```
-
-These assets need to be written to the web directory so these URLs don't
-return 404 errors.
-
-``` php
-<?php
-
-use Assetic\AssetWriter;
-use Assetic\Extension\Twig\TwigFormulaLoader;
-use Assetic\Extension\Twig\TwigResource;
-use Assetic\Factory\LazyAssetManager;
-
-$am = new LazyAssetManager($factory);
-
-// enable loading assets from twig templates
-$am->setLoader('twig', new TwigFormulaLoader($twig));
-
-// loop through all your templates
-foreach ($templates as $template) {
-    $resource = new TwigResource($twigLoader, $template);
-    $am->addResource($resource, 'twig');
-}
-
-$writer = new AssetWriter('/path/to/web');
-$writer->writeManagerAssets($am);
-```
-
----
-
-Assetic is based on the Python [webassets][1] library (available on
-[GitHub][2]).
-
-[1]: http://elsdoerfer.name/docs/webassets
-[2]: https://github.com/miracle2k/webassets
-[3]: http://twig.sensiolabs.org

vendor/assetic/composer.json

@@ -1,21 +0,0 @@
-{
-    "name": "kriswallsmith/assetic",
-    "description": "Asset Management for PHP",
-    "keywords": ["assets", "compression", "minification"],
-    "homepage": "https://github.com/kriswallsmith/assetic",
-    "type": "library",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Kris Wallsmith",
-            "email": "kris.wallsmith@gmail.com",
-            "homepage": "http://kriswallsmith.net/"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.1"
-    },
-    "autoload": {
-        "psr-0": { "Assetic": "src/" }
-    }
-}

vendor/assetic/docs/en/build.md

@@ -1,32 +0,0 @@
-Building and Dumping Assets
----------------------------
-
-The is the simplest approach to using Assetic. It involves two steps:
-
- 1. Create a PHP script in your web directory that uses the Assetic OOP API to
-    create and output an asset.
- 2. Reference that file from your template.
-
-For example, you could create a file in your web directory at
-`assets/javascripts.php` with the following code:
-
-    use Assetic\Asset\AssetCollection;
-    use Assetic\Asset\FileAsset;
-    use Assetic\Filter\Yui\JsCompressorFilter as YuiCompressorFilter;
-
-    $js = new AssetCollection(array(
-        new FileAsset(__DIR__.'/jquery.js'),
-        new FileAsset(__DIR__.'/application.js'),
-    ), array(
-        new YuiCompressorFilter('/path/to/yuicompressor.jar'),
-    ));
-
-    header('Content-Type: application/js');
-    echo $js->dump();
-
-In your HTML template you would include this generated Javascript using a
-simple `<script>` tag:
-
-    <script src="/assets/javascripts.php"></script>
-
-Next: [Basic Concepts](concepts.md)

vendor/assetic/docs/en/concepts.md

@@ -1,129 +0,0 @@
-In order to use the Assetic OOP API you must first understand the two central
-concepts of Assetic: assets and filters.
-
-### What is an Asset?
-
-As asset is an object that has content and metadata which can be loaded and
-dumped. Your assets will probably fall into three categories: Javascripts,
-stylesheets and images. Most assets will be loaded from files in your
-filesystem, but they can also be loaded via HTTP, a database, from a string,
-or virtually anything else. All that an asset has to do is fulfill Assetic's
-basic asset interface.
-
-### What is a Filter?
-
-A filter is an object that acts upon an asset's content when that asset is
-loaded and/or dumped. Similar to assets, a filter can do virtually anything,
-as long as it implements Assetic's filter interface. 
-
-Here is a list of some of the tools that can be applied to assets using a
-filter:
-
- * CoffeeScript
- * CssEmbed
- * CssMin
- * Google Closure Compiler
- * jpegoptim
- * jpegtran
- * Less
- * LessPHP
- * optipng
- * Packager
- * pngout
- * SASS
- * Sprockets (version 1)
- * Stylus
- * YUI Compressor
-
-### Using Assets and Filters
-
-You need to start by creating an asset object. This will probably mean
-instantiating a `FileAsset` instance, which takes a filesystem path as its
-first argument:
-
-    $asset = new Assetic\Asset\FileAsset('/path/to/main.css');
-
-Once you have an asset you can begin adding filters to it by calling
-`ensureFilter()`. For example, you can add a filter that applies the YUI
-Compressor to the contents of the asset:
-
-    $yui = new Assetic\Filter\Yui\CssCompressorFilter('/path/to/yui.jar');
-    $asset->ensureFilter($yui);
-
-Once you've added as many filters as you'd like you can output the finished
-asset to the browser:
-
-    header('Content-Type: text/css');
-    echo $asset->dump();
-
-### Asset Collections
-
-It is a good idea to combine assets of the same type into a single file to
-avoid unnecessary HTTP requests. You can do this in Assetic using the
-`AssetCollection` class. This class is just like any other asset in Assetic's
-eyes as it implements the asset interface, but under the hood it allows you to
-combine multiple assets into one.
-
-    use Assetic\Asset\AssetCollection;
-
-    $asset = new AssetCollection(array(
-        new FileAsset('/path/to/js/jquery.js'),
-        new FileAsset('/path/to/js/jquery.plugin.js'),
-        new FileAsset('/path/to/js/application.js'),
-    ));
-
-### Nested Asset Collections
-
-The collection class implements the asset interface and all assets passed into
-a collection must implement the same interface, which means you can easily
-nest collections within one another:
-
-    use Assetic\Asset\AssetCollection;
-    use Assetic\Asset\GlobAsset;
-    use Assetic\Asset\HttpAsset;
-
-    $asset = new AssetCollection(array(
-        new HttpAsset('http://example.com/jquery.min.js'),
-        new GlobAsset('/path/to/js/*'),
-    ));
-
-The `HttpAsset` class is a special asset class that loads a file over HTTP;
-`GlobAsset` is a special asset collection class that loads files based on a
-filesystem glob -- both implement the asset interface.
-
-This concept of nesting asset collection become even more powerful when you
-start applying different sets of filters to each collection. Imagine some of
-your application's stylesheets are written in SASS, while some are written in
-vanilla CSS. You can combine all of these into one seamless CSS asset:
-
-    use Assetic\Asset\AssetCollection;
-    use Assetic\Asset\GlobAsset;
-    use Assetic\Filter\SassFilter;
-    use Assetic\Filter\Yui\CssCompressorFilter;
-
-    $css = new AssetCollection(array(
-        new GlobAsset('/path/to/sass/*.sass', array(new SassFilter())),
-        new GlobAsset('/path/to/css/*.css'),
-    ), array(
-        new YuiCompressorFilter('/path/to/yuicompressor.jar'),
-    ));
-
-You'll notice I've also applied the YUI compressor filter to the combined
-asset so all CSS will be minified.
-
-### Iterating over an Asset Collection
-
-Once you have an asset collection you can iterate over it like you would a
-plain old PHP array:
-
-    echo "Source paths:\n";
-    foreach ($collection as $asset) {
-        echo ' - '.$asset->getSourcePath()."\n";
-    }
-
-The asset collection iterates recursively, which means you will only see the
-"leaf" assets during iteration. Iteration also includes a smart filter which
-ensures you only see each asset once, even if the same asset has been included
-multiple times.
-
-Next: [Defining Assets "On The Fly"](define.md)

vendor/assetic/docs/en/define.md

@@ -1,145 +0,0 @@
-Defining Assets "On The Fly"
-----------------------------
-
-The second approach to using Assetic involves defining your application's
-assets "on the fly" in your templates, instead of in an isolated PHP file.
-Using this approach, your PHP template would look something like this:
-
-    <script src="<?php echo assetic_javascripts('js/*', 'yui_js') ?>"></script>
-
-This call to `assetic_javascripts()` serves a dual purpose. It will be read by
-the Assetic "formula loader" which will extract an asset "formula" that can be
-used to build, dump and output the asset. It will also be executed when the
-template is rendered, at which time the path to the output asset is output.
-
-Assetic includes the following templating helper functions:
-
- * `assetic_image()`
- * `assetic_javascripts()`
- * `assetic_stylesheets()`
-
-Defining assets on the fly is a much more sophisticated technique and
-therefore relies on services to do the heavy lifting. The main one being the
-asset factory.
-
-### Asset Factory
-
-The asset factory knows how to create asset objects using only arrays and
-scalar values as input. This is the same string syntax used by the `assetic_*`
-template helper functions.
-
-    use Assetic\Factory\AssetFactory;
-
-    $factory = new AssetFactory('/path/to/web');
-    $js = $factory->createAsset(array(
-        'js/jquery.js',
-        'js/jquery.plugin.js',
-        'js/application.js',
-    ));
-
-### Filter Manager
-
-You can also apply filters to asset created by the factory. To do this you
-must setup a `FilterManager`, which organizes filters by a name.
-
-    use Assetic\FilterManager;
-    use Assetic\Filter\GoogleClosure\ApiFilter as ClosureFilter;
-
-    $fm = new FilterManager();
-    $fm->set('closure', new ClosureFilter());
-    $factory->setFilterManager($fm);
-
-    $js = $factory->createAsset('js/*', 'closure');
-
-This code creates an instance of the Google Closure Compiler filter and
-assigns it the name `closure` using a filter manager. This filter manager is
-then injected into the asset factory, making the filter available as `closure`
-when creating assets.
-
-### Debug Mode
-
-The asset factory also introduces the concept of a debug mode. This mode
-allows you to omit certain filters from assets the factory creates depending
-on whether it is enabled or not.
-
-For example, the YUI Compressor is awesome, but it is only appropriate in a
-production environment as it is very difficult to debug minified Javascript.
-
-    use Asset\Factory\AssetFactory;
-
-    $factory = new AssetFactory('/path/to/web', true); // debug mode is on
-    $factory->setFilterManager($fm);
-    $js = $factory->createAsset('js/*', '?closure');
-
-By prefixing the `closure` filter's name with a question mark, we are telling
-the factory this filter is optional and should only be applied with debug mode
-is off.
-
-### Asset Manager and Asset References
-
-The asset factory provides another special string syntax that allows you to
-reference assets you defined elsewhere. These are called "asset references"
-and involve an asset manager which, similar to the filter manager, organizes
-assets by name.
-
-    use Assetic\AssetManager;
-    use Assetic\Asset\FileAsset;
-    use Assetic\Factory\AssetFactory;
-
-    $am = new AssetManager();
-    $am->set('jquery', new FileAsset('/path/to/jquery.js'));
-
-    $factory = new AssetFactory('/path/to/web');
-    $factory->setAssetManager($am);
-
-    $js = $factory->createAsset(array(
-        '@jquery',
-        'js/application.js',
-    ));
-
-### Extracting Assets from Templates
-
-Once you've defined a set of assets in your templates you must use the
-"formula loader" service to extract these asset definitions.
-
-    use Assetic\Factory\Loader\FunctionCallsFormulaLoader;
-    use Assetic\Factory\Resource\FileResource;
-
-    $loader = new FunctionCallsFormulaLoader($factory);
-    $formulae = $loader->load(new FileResource('/path/to/template.php'));
-
-These asset formulae aren't much use by themselves. They each include just
-enough information for the asset factory to create the intended asset object.
-In order for these to be useful they must be wrapped in the special
-`LazyAssetManager`.
-
-### The Lazy Asset Manager
-
-This service is a composition of the asset factory and one or more formula
-loaders. It acts as the glue between these services behind the scenes, but can
-be used just like a normal asset manager on the surface.
-
-    use Assetic\Asset\FileAsset;
-    use Assetic\Factory\LazyAssetManager;
-    use Assetic\Factory\Loader\FunctionCallsFormulaLoader;
-    use Assetic\Factory\Resource\DirectoryResource;
-
-    $am = new LazyAssetManager($factory);
-    $am->set('jquery', new FileAsset('/path/to/jquery.js'));
-    $am->setLoader('php', new FunctionCallsFormulaLoader($factory));
-    $am->addResource(new DirectoryResource('/path/to/templates', '/\.php$/'), 'php');
-
-### Asset Writer
-
-Finally, once you've create an asset manager that knows about every asset
-you've defined in your templates, you must use an asset writer to actually
-create the files your templates are going to be referencing.
-
-    use Assetic\AssetWriter;
-
-    $writer = new AssetWriter('/path/to/web');
-    $writer->writeManagerAssets($am);
-
-After running this script, all of the assets in your asset manager will be
-loaded into memory, filtered with their configured filters and dumped to your
-web directory as static files, ready to be served.

vendor/assetic/docs/en/index.md

@@ -1,7 +0,0 @@
-Table Of Contents
------------------
-
- 1. [Introduction](introduction.md)
- 2. [Building and Dumping Assets](build.md)
- 3. [Basic Concepts](concepts.md)
- 4. [Defining Assets "On The Fly"](define.md)

vendor/assetic/docs/en/introduction.md

@@ -1,21 +0,0 @@
-What is Assetic?
-----------------
-
-Assetic is an asset management framework for PHP 5.3. Assetic enables you to
-use a variety of third party tools that will help bring order to your
-application's Javascripts, stylesheets and images.
-
-How Do I Use Assetic?
----------------------
-
-There are two distinct approaches you can take when using Assetic:
-
- 1. Build, dump and output assets in PHP files that you reference directly
-    from your templates
- 2. Defining assets in your templates ("on the fly") and use a loader to
-    extract, dump and output them
-
-The first approach is simpler, but the second, with all its moving parts,
-offers more flexibility and opportunity for optimization.
-
-Next: [Building and Dumping Assets](build.md)

vendor/assetic/docs/ja/build.md

@@ -1,30 +0,0 @@
-アセットのビルドとダンプ
----------------------------
-
-Asseticを使う一番単純な方法は、次の2ステップからなります。
-
- 1. 公開領域内にPHPスクリプトを作成し、Assetic OOP APIを使用してアセットの作成・出力を行う
- 2. テンプレートから上記のファイルを参照する
-
-例えば、公開領域内に`assets/javascripts.php`ファイルを作成し、
-下記のようなコードを記述します。
-
-    use Assetic\Asset\AssetCollection;
-    use Assetic\Asset\FileAsset;
-    use Assetic\Filter\Yui\JsCompressorFilter as YuiCompressorFilter;
-
-    $js = new AssetCollection(array(
-        new FileAsset(__DIR__.'/jquery.js'),
-        new FileAsset(__DIR__.'/application.js'),
-    ), array(
-        new YuiCompressorFilter('/path/to/yuicompressor.jar'),
-    ));
-
-    header('Content-Type: application/js');
-    echo $js->dump();
-
-HTMLテンプレート側では、単に`<script>`タグを用いて、生成されたJavascriptをインクルードすることになります。
-
-    <script src="/assets/javascripts.php"></script>
-
-Next: [コンセプト](concepts.md)

vendor/assetic/docs/ja/concepts.md

@@ -1,121 +0,0 @@
-Assetic OOP APIを使用するためには、まず、[アセット」と「フィルタ」の2つの重要なコンセプトを理解する必要があります。
-
-### アセット
-
-アセットとは、読み込み、及びダンプが可能な、コンテンツとメタデータを内包しているオブジェクトの事を指します。
-大体の場合において3つのカテゴリー、すなわち、Javascriptとスタイルシート、画像のどれかに属することになるでしょう。
-読み込みの方法としては、ファイルシステムからがほとんどですが、
-HTTPやデータベース経由でも、文字列としてでも読み込みが可能で、事実上あらゆるものが読み込み可能です。
-Asseticのアセットインターフェースを満足させさえすれば良いのです。
-
-
-### フィルタ
- 
-フィルタは、アセットが読み込まれる、かつ/もしくは、ダンプされる際に、
-アセットコンテンツに対して作用するオブジェクトです。
-アセットと同様に、Asseticのフィルタインターフェースを実装することで、
-どのような作用も可能になります。
-
-フィルタを用いて、アセットに適用できるツール群の一覧です。
-
- * CoffeeScript
- * CssEmbed
- * CssMin
- * Google Closure Compiler
- * jpegoptim
- * jpegtran
- * Less
- * LessPHP
- * optipng
- * Packager
- * pngout
- * SASS
- * Sprockets (version 1)
- * Stylus
- * YUI Compressor
-
-
-### アセットとフィルタの使用
-
-まずはアセットオブジェクトを作成することから始まります。
-多くの場合は`FileAsset`をインスタンス化し、ファイルシステムのパスを第一引数に渡します。
-
-    $asset = new Assetic\Asset\FileAsset('/path/to/main.css');
-
-アセットオブジェクトを作成したら、`ensureFilter()`を呼び、フィルタを追加します。
-例えば、アセットコンテンツにYUI Compressorを適用してみましょう。
-
-    $yui = new Assetic\Filter\Yui\CssCompressorFilter('/path/to/yui.jar');
-    $asset->ensureFilter($yui);
-
-任意のフィルタを追加したら、完成したアセットをブラウザに出力してみましょう。
-
-    header('Content-Type: text/css');
-    echo $asset->dump();
-
-### アセットコレクション
-
-1つのファイルに同じ種類のアセットをまとめて、不要なHTTPリクエストを抑えてみるのも良いでしょう。
-Asseticでは`AsseticColletion`クラスを使用することで可能となります。
-Assetic内部的には、このクラス自体は他のアセットと同様に、アセットインターフェースを実装したものですが、
-複数のアセットを1つにまとめることが可能になります。
-
-    use Assetic\Asset\AssetCollection;
-
-    $asset = new AssetCollection(array(
-        new FileAsset('/path/to/js/jquery.js'),
-        new FileAsset('/path/to/js/jquery.plugin.js'),
-        new FileAsset('/path/to/js/application.js'),
-    ));
-
-### ネストしたアセットコレクション
-
-コレクションクラス自体がアセットインターフェースを実装し、コレクション内のアセットも同様に
-アセットインターフェースを実装しているので、簡単にネストすることができます。
-
-    use Assetic\Asset\AssetCollection;
-    use Assetic\Asset\GlobAsset;
-    use Assetic\Asset\HttpAsset;
-
-    $asset = new AssetCollection(array(
-        new HttpAsset('http://example.com/jquery.min.js'),
-        new GlobAsset('/path/to/js/*'),
-    ));
-
-`HttpAsset`は、HTTP経由でファイルを読み込むアセットクラス。
-`GlobAsset`は、ファイルシステムのglobを基にファイル群を読み込むアセットコレクションクラス。
-両者ともにアセットインターフェースを実装しています。
-
-このネストしたアセットコレクションという概念は、コレクションそれぞれに異なる
-フィルタ群を適用しようとしたときに、効果を発揮します。
-例えば、スタイルシートがSAASで記述されたものと、vanilla CSSを用いて記述されたものからなる
-アプリケーションを考えた場合、次のようにして、全てを1つのシームレスなCSSアセットにまとめることができます。
-
-    use Assetic\Asset\AssetCollection;
-    use Assetic\Asset\GlobAsset;
-    use Assetic\Filter\SassFilter;
-    use Assetic\Filter\Yui\CssCompressorFilter;
-
-    $css = new AssetCollection(array(
-        new GlobAsset('/path/to/sass/*.sass', array(new SassFilter())),
-        new GlobAsset('/path/to/css/*.css'),
-    ), array(
-        new YuiCompressorFilter('/path/to/yuicompressor.jar'),
-    ));
-
-上記の例では、1つにまとめられたCSSを、さらにYUI compressorフィルタを適用することで、全体を圧縮しています。
-
-### アセットコレクションのイテレーション
-
-アセットコレクションは、旧来のPHP配列のように、イテレートできます。
-
-    echo "Source paths:\n";
-    foreach ($collection as $asset) {
-        echo ' - '.$asset->getSourcePath()."\n";
-    }
-
-アセットコレクションのイテレーションは再帰的で、「葉」にあたるアセットの取得を行います。
-また、気の利いたフィルタを内蔵しているので、同じアセットがコレクション内に複数存在する場合でも、
-一度だけのインクルードが保証されます。
-
-Next: [アセットを「オンザフライ」で定義する](define.md)

vendor/assetic/docs/ja/define.md

@@ -1,140 +0,0 @@
-アセットの「オンザフライ」な定義
-----------------------------------------
-
-Asseticの使用方法二つ目は、独立したPHPファイルを使用する代わりに、
-テンプレートで「オンザフライ」にアセット定義をする方法です。
-このアプローチでは、PHPテンプレートは下記のようになります。
-
-    <script src="<?php echo assetic_javascripts('js/*', 'yui_js') ?>"></script>
-
-`assetic_javascripts()`の呼び出しは2つの目的を兼ねています。
-まず、「フォーミュラローダー」により走査され、アセットの構築、ダンプ、及び出力を行うための「フォーミュラ(処方箋)」が抽出されます。
-また、テンプレートのレンダー時にも実行され、アセットの出力パスが出力されます。
-
-Asseticには下記のようなヘルパー関数があります。
-
- * `assetic_image()`
- * `assetic_javascripts()`
- * `assetic_stylesheets()`
-
-アセットをオンザフライに定義するということは、より高度なテクニックであり、
-そのため、重い仕事をするサービスに依存することになります。
-そのうちの重要なものがアセットファクトリです。
-
-### アセットファクトリ
-
-アセットファクトリは、アセットオブジェクトを、配列とスカラ値のみから、
-どのように作成するのか把握しています。
-`assetic_*`ヘルパー関数で使用する記法と同様のものとなります。
-
-    use Assetic\Factory\AssetFactory;
-
-    $factory = new AssetFactory('/path/to/web');
-    $js = $factory->createAsset(array(
-        'js/jquery.js',
-        'js/jquery.plugin.js',
-        'js/application.js',
-    ));
-
-### フィルタマネージャー
-
-ファクトリによって作成されたアセットに対しても、フィルタを適用することができます。
-そのためには、`FilterManager`を設定して、名前を定義しフィルタを構成します。
-
-    use Assetic\FilterManager;
-    use Assetic\Filter\GoogleClosure\ApiFilter as ClosureFilter;
-
-    $fm = new FilterManager();
-    $fm->set('closure', new ClosureFilter());
-    $factory->setFilterManager($fm);
-
-    $js = $factory->createAsset('js/*', 'closure');
-
-上記の例では、Google Closure Compilerフィルタをインスタンス化し、
-フィルタマネージャーを通じて`closure`という名前をつけています。
-このフィルタマネージャーをアセットファクトリに渡すことで、
-アセット作成時には、`closure`という名前でフィルタを使用できるようになります。
-
-### デバッグモード
-
-アセットファクトリは、デバッグモードというコンセプトも取り入れており、
-デバッグモードの設定により、ファクトリが作成するアセットから、
-特定のフィルタを除外することができます。
-
-たとえば、YUI Compressorは大変素晴らしいのですが、圧縮されたJavascriptを
-デバッグするのは大変難しく、プロダクション環境でのみの使用が適切でしょう。
-
-    use Asset\Factory\AssetFactory;
-
-    $factory = new AssetFactory('/path/to/web', true); // デバッグモードON
-    $factory->setFilterManager($fm);
-    $js = $factory->createAsset('js/*', '?closure');
-
-フィルタ名`closure`の前にクエスチョンマークを記述すると、ファクトリに対して、
-このフィルタはオプションであり、
-デバッグモードがOFFの時にのみ適用するように通知することができます。
-
-### アセットマネージャーとアセットリファレンス
-
-アセットファクトリにはもう一つ特別な記法があり、別の場所で定義した
-アセットを参照することができるようになります。
-これを「アセットリファレンス」と呼び、アセットマネージャーを通じて、
-フィルタマネージャーと同様の、名前によるアセットの構成が可能です。
-
-    use Assetic\AssetManager;
-    use Assetic\Asset\FileAsset;
-    use Assetic\Factory\AssetFactory;
-
-    $am = new AssetManager();
-    $am->set('jquery', new FileAsset('/path/to/jquery.js'));
-
-    $factory = new AssetFactory('/path/to/web');
-    $factory->setAssetManager($am);
-
-    $js = $factory->createAsset(array(
-        '@jquery',
-        'js/application.js',
-    ));
-
-### テンプレートからのアセット抽出
-
-テンプレート内でアセット群を定義したら、「フォーミュラローダー」サービスを使用して、
-アセットの定義を抽出します。
-
-    use Assetic\Factory\Loader\FunctionCallsFormulaLoader;
-    use Assetic\Factory\Resource\FileResource;
-
-    $loader = new FunctionCallsFormulaLoader($factory);
-    $formulae = $loader->load(new FileResource('/path/to/template.php'));
-
-これらのフォーミュラ自体は、それ自体で使途はあまりなく、
-アセットファクトリが目的のアセットオブジェクトを作成するに足る情報しか持っていません。
-`LazyAssetManager`でラップすることで有益なものとなります。
-
-### レイジーなアセットマネージャー
-
-このサービスは、アセットファクトリと、1つ以上のフォーミュラローダーから成っており、
-裏方のサービス間のグルとして動作しますが、表面上では、通常のアセットマネージャーと同じように使用することができます。
-
-    use Assetic\Asset\FileAsset;
-    use Assetic\Factory\LazyAssetManager;
-    use Assetic\Factory\Loader\FunctionCallsFormulaLoader;
-    use Assetic\Factory\Resource\DirectoryResource;
-
-    $am = new LazyAssetManager($factory);
-    $am->set('jquery', new FileAsset('/path/to/jquery.js'));
-    $am->setLoader('php', new FunctionCallsFormulaLoader($factory));
-    $am->addResource(new DirectoryResource('/path/to/templates', '/\.php$/'), 'php');
-
-### アセットライター
-
-作成したアセットマネージャーが、テンプレート内で定義した全てのアセットを把握したら、
-アセットライターを使用して、テンプレートが参照することになる実際のファイルを作成します。
-
-    use Assetic\AssetWriter;
-
-    $writer = new AssetWriter('/path/to/web');
-    $writer->writeManagerAssets($am);
-
-上記のスクリプトを実行すると、アセットマネージャー内のすべてのアセットがメモリに読み込まれ、
-指定したフィルタが適用された後、公開領域に静的ファイルとしてダンプされ、準備完了となります。

vendor/assetic/docs/ja/index.md

@@ -1,7 +0,0 @@
-目次
------
-
- 1. [イントロダクション](introduction.md)
- 2. [アセットの構築とダンプ](build.md)
- 3. [コンセプト](concepts.md)
- 4. [アセットを「オンザフライ」で定義する](define.md)