Development

Changeset 32441

You must first sign up to be able to contribute.

Changeset 32441

Show
Ignore:
Timestamp:
04/04/11 13:15:42 (2 years ago)
Author:
fabien
Message:

Merge branch 'master' of git://github.com/symfony/symfony

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/2.0/UPDATE.md

    r32440 r32441  
    1919 
    2020    *Doctrine*:    `$em->find('Blog:Post', $id)` -> `$em->find('BlogBundle:Post', $id)` 
     21 
     22* `ZendBundle` has been replaced by `MonologBundle`. Have a look at the 
     23  changes made to Symfony SE to see how to upgrade your projects: 
     24  https://github.com/symfony/symfony-standard/pull/30/files 
    2125 
    2226* Almost all core bundles parameters have been removed. You should use the 

  • branches/2.0/autoload.php.dist

    r32179 r32441  
    1616    'Doctrine\\DBAL'                 => __DIR__.'/vendor/doctrine-dbal/lib', 
    1717    'Doctrine'                       => __DIR__.'/vendor/doctrine/lib', 
    18     'Zend'                           => __DIR__.'/vendor/zend/library', 
    1918    'Assetic'                        => __DIR__.'/vendor/assetic/src', 
     19    'Monolog'                        => __DIR__.'/vendor/monolog/src', 
    2020)); 
    2121$loader->registerPrefixes(array( 

  • branches/2.0/src/Symfony/Bundle/DoctrineBundle/Resources/config/dbal.xml

    r32439 r32441  
    2121 
    2222        <service id="doctrine.dbal.logger" class="%doctrine.dbal.logger_class%" public="false"> 
     23            <tag name="monolog.logger" channel="doctrine" /> 
    2324            <argument type="service" id="logger" on-invalid="null" /> 
    2425        </service> 

  • branches/2.0/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/config/mongodb.xml

    r32439 r32441  
    8888        <service id="doctrine.odm.mongodb.logger" class="%doctrine.odm.mongodb.logger_class%"> 
    8989            <argument type="service" id="logger" on-invalid="null" /> 
     90            <tag name="monolog.logger" channel="doctrine" /> 
    9091        </service> 
    9192        <service id="doctrine.odm.mongodb.data_collector" class="%doctrine.odm.mongodb.data_collector_class%" public="false"> 

  • branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml

    r32439 r32441  
    3939        <service id="data_collector.logger" class="%data_collector.logger.class%" public="false"> 
    4040            <tag name="data_collector" template="WebProfilerBundle:Collector:logger" id="logger" priority="255" /> 
     41            <tag name="monolog.logger" channel="profiler" /> 
    4142            <argument type="service" id="logger" on-invalid="ignore" /> 
    4243        </service> 

  • branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml

    r32299 r32441  
    1111    <services> 
    1212        <service id="debug.event_dispatcher" class="%debug.event_dispatcher.class%"> 
     13            <tag name="monolog.logger" channel="event" /> 
    1314            <argument type="service" id="service_container" /> 
    1415            <argument type="service" id="logger" on-invalid="null" /> 

  • branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.xml

    r32299 r32441  
    1212    <services> 
    1313        <service id="profiler" class="%profiler.class%" scope="request"> 
     14            <tag name="monolog.logger" channel="profiler" /> 
    1415            <argument type="service" id="profiler.storage" /> 
    1516            <argument type="service" id="logger" on-invalid="null" /> 

  • branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml

    r32184 r32441  
    4949 
    5050        <service id="routing.loader.real" class="%routing.loader.class%"> 
     51            <tag name="monolog.logger" channel="router" /> 
    5152            <argument type="service" id="controller_name_converter" /> 
    5253            <argument type="service" id="logger" on-invalid="null" /> 

  • branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_debug.xml

    r32184 r32441  
    1111    <services> 
    1212        <service id="templating.debugger" class="%templating.debugger.class%" public="false"> 
     13            <tag name="monolog.logger" channel="templating" /> 
    1314            <argument type="service" id="logger" on-invalid="null" /> 
    1415        </service> 

  • branches/2.0/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml

    r32417 r32441  
    1515    <services> 
    1616        <service id="controller_name_converter" class="%controller_name_converter.class%" public="false"> 
     17            <tag name="monolog.logger" channel="request" /> 
    1718            <argument type="service" id="kernel" /> 
    1819            <argument type="service" id="logger" on-invalid="ignore" /> 
    …… 
    2021 
    2122        <service id="controller_resolver" class="%controller_resolver.class%" public="false"> 
     23            <tag name="monolog.logger" channel="request" /> 
    2224            <argument type="service" id="service_container" /> 
    2325            <argument type="service" id="controller_name_converter" /> 
    …… 
    2729        <service id="request_listener" class="%request_listener.class%"> 
    2830            <tag name="kernel.listener" event="onCoreRequest" /> 
     31            <tag name="monolog.logger" channel="request" /> 
    2932            <argument type="service" id="service_container" /> 
    3033            <argument type="service" id="router" /> 
    …… 
    3942        <service id="exception_listener" class="%exception_listener.class%"> 
    4043            <tag name="kernel.listener" event="onCoreException" priority="-128" /> 
     44            <tag name="monolog.logger" channel="request" /> 
    4145            <argument /> <!-- controller name --> 
    4246            <argument type="service" id="logger" on-invalid="null" /> 

  • branches/2.0/src/Symfony/Bundle/MonologBundle/MonologBundle.php

    r32184 r32441  
    1010 */ 
    1111 
    12 namespace Symfony\Bundle\ZendBundle; 
     12namespace Symfony\Bundle\MonologBundle; 
    1313 
    1414use Symfony\Component\HttpKernel\Bundle\Bundle; 
    1515use Symfony\Component\DependencyInjection\ContainerBuilder; 
    16 use Symfony\Bundle\ZendBundle\DependencyInjection\Compiler\ZendLoggerWriterPass; 
     16use Symfony\Bundle\MonologBundle\DependencyInjection\Compiler\LoggerChannelPass; 
     17use Symfony\Bundle\MonologBundle\DependencyInjection\Compiler\DebugHandlerPass; 
    1718 
    1819/** 
    1920 * Bundle. 
    2021 * 
    21  * @author Fabien Potencier <fabien@symfony.com> 
     22 * @author Jordi Boggiano <j.boggiano@seld.be> 
    2223 */ 
    23 class ZendBundle extends Bundle 
     24class MonologBundle extends Bundle 
    2425{ 
    2526    public function build(ContainerBuilder $container) 
    …… 
    2728        parent::build($container); 
    2829 
    29         $container->addCompilerPass(new ZendLoggerWriterPass()); 
     30        $container->addCompilerPass(new LoggerChannelPass()); 
     31        $container->addCompilerPass(new DebugHandlerPass()); 
    3032    } 
    3133} 

  • branches/2.0/src/Symfony/Bundle/SecurityBundle/Resources/config/security_acl.xml

    r32440 r32441  
    4848        <service id="security.acl.cache.doctrine" class="%security.acl.cache.doctrine.class%" public="false"> 
    4949            <argument type="service" id="security.acl.cache.doctrine_cache_impl" /> 
    50             <argument type="service" id="security.acl.permission_granting_strategy" />         
     50            <argument type="service" id="security.acl.permission_granting_strategy" /> 
    5151        </service> 
    5252 
    …… 
    5656 
    5757        <service id="security.acl.voter.basic_permissions" class="%security.acl.voter.class%" public="false"> 
     58            <tag name="monolog.logger" channel="security" /> 
    5859            <argument type="service" id="security.acl.provider" /> 
    5960            <argument type="service" id="security.acl.object_identity_retrieval_strategy" /> 

  • branches/2.0/src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml

    r32313 r32441  
    4242    <services> 
    4343        <service id="security.authentication.listener.anonymous" class="%security.authentication.listener.anonymous.class%" public="false"> 
     44            <tag name="monolog.logger" channel="security" /> 
    4445            <argument type="service" id="security.context" /> 
    4546            <argument /> <!-- Key --> 
    …… 
    5859 
    5960        <service id="security.channel_listener" class="%security.channel_listener.class%" public="false"> 
     61            <tag name="monolog.logger" channel="security" /> 
    6062            <argument type="service" id="security.access_map" /> 
    6163            <argument type="service" id="security.authentication.retry_entry_point" /> 
    …… 
    6668 
    6769        <service id="security.context_listener" class="%security.context_listener.class%" public="false"> 
     70            <tag name="monolog.logger" channel="security" /> 
    6871            <argument type="service" id="security.context" /> 
    6972            <argument type="collection"></argument> 
    …… 
    8790 
    8891        <service id="security.authentication.listener.abstract" abstract="true" public="false"> 
     92            <tag name="monolog.logger" channel="security" /> 
    8993            <argument type="service" id="security.context" /> 
    9094            <argument type="service" id="security.authentication.manager" /> 
    …… 
    98102        </service> 
    99103 
    100         <service id="security.authentication.listener.form"  
    101                  class="%security.authentication.listener.form.class%"  
     104        <service id="security.authentication.listener.form" 
     105                 class="%security.authentication.listener.form.class%" 
    102106                 parent="security.authentication.listener.abstract" 
    103107                 abstract="true"> 
    …… 
    105109 
    106110        <service id="security.authentication.listener.x509" class="%security.authentication.listener.x509.class%" public="false" abstract="true"> 
     111            <tag name="monolog.logger" channel="security" /> 
    107112            <argument type="service" id="security.context" /> 
    108113            <argument type="service" id="security.authentication.manager" /> 
    …… 
    115120 
    116121        <service id="security.authentication.listener.basic" class="%security.authentication.listener.basic.class%" public="false" abstract="true"> 
     122            <tag name="monolog.logger" channel="security" /> 
    117123            <argument type="service" id="security.context" /> 
    118124            <argument type="service" id="security.authentication.manager" /> 
    …… 
    123129 
    124130        <service id="security.authentication.listener.digest" class="%security.authentication.listener.digest.class%" public="false" abstract="true"> 
     131            <tag name="monolog.logger" channel="security" /> 
    125132            <argument type="service" id="security.context" /> 
    126133            <argument /> <!-- User Provider --> 
    …… 
    143150 
    144151        <service id="security.exception_listener" class="%security.exception_listener.class%" public="false" abstract="true"> 
     152            <tag name="monolog.logger" channel="security" /> 
    145153            <argument type="service" id="security.context" /> 
    146154            <argument type="service" id="security.authentication.trust_resolver" /> 
    …… 
    152160 
    153161        <service id="security.authentication.switchuser_listener" class="%security.authentication.switchuser_listener.class%" public="false" abstract="true"> 
     162            <tag name="monolog.logger" channel="security" /> 
    154163            <argument type="service" id="security.context" /> 
    155164            <argument /> <!-- User Provider --> 
    …… 
    164173 
    165174        <service id="security.access_listener" class="%security.access_listener.class%" public="false"> 
     175            <tag name="monolog.logger" channel="security" /> 
    166176            <argument type="service" id="security.context" /> 
    167177            <argument type="service" id="security.access.decision_manager" /> 

  • branches/2.0/src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml

    r32380 r32441  
    77    <parameters> 
    88        <parameter key="security.authentication.provider.rememberme.class">Symfony\Component\Security\Core\Authentication\Provider\RememberMeAuthenticationProvider</parameter> 
    9          
     9 
    1010        <parameter key="security.authentication.listener.rememberme.class">Symfony\Component\Security\Http\Firewall\RememberMeListener</parameter> 
    11         <parameter key="security.rememberme.token.provider.in_memory.class">Symfony\Component\Security\Core\Authentication\RememberMe\InMemoryTokenProvider</parameter> 
    12          
     11        <parameter key="security.rembemerme.token.provider.in_memory.class">Symfony\Component\Security\Core\Authentication\RememberMe\InMemoryTokenProvider</parameter> 
     12 
    1313        <parameter key="security.authentication.rememberme.services.persistent.class">Symfony\Component\Security\Http\RememberMe\PersistentTokenBasedRememberMeServices</parameter> 
    1414        <parameter key="security.authentication.rememberme.services.simplehash.class">Symfony\Component\Security\Http\RememberMe\TokenBasedRememberMeServices</parameter> 
    15          
     15 
    1616        <parameter key="security.rememberme.response_listener.class">Symfony\Bundle\SecurityBundle\ResponseListener</parameter> 
    1717    </parameters> 
    18      
     18 
    1919    <services> 
    2020        <service id="security.authentication.listener.rememberme" class="%security.authentication.listener.rememberme.class%" public="false" abstract="true"> 
     21            <tag name="monolog.logger" channel="security" /> 
    2122            <argument type="service" id="security.context" /> 
    2223            <argument type="service" id="security.authentication.rememberme" /> 
    …… 
    2526            <argument type="service" id="event_dispatcher" on-invalid="null"/> 
    2627        </service> 
    27          
     28 
    2829        <service id="security.authentication.provider.rememberme" class="%security.authentication.provider.rememberme.class%" abstract="true" public="false"> 
    2930            <argument type="service" id="security.user_checker" /> 
    3031        </service> 
    3132 
    32         <service id="security.rememberme.token.provider.in_memory" class="%security.rememberme.token.provider.in_memory.class%" public="false"></service> 
    33          
     33        <service id="security.rememberme.token.provider.in_memory" class="%security.rembemerme.token.provider.in_memory.class%" public="false"></service> 
     34 
    3435        <service id="security.authentication.rememberme.services.abstract" abstract="true" public="false"> 
     36            <tag name="monolog.logger" channel="security" /> 
    3537            <argument type="collection" /> <!--  User Providers --> 
    3638            <argument /> <!-- Shared Token Key --> 
    …… 
    3941            <argument type="service" id="logger" on-invalid="null" /> 
    4042        </service> 
    41          
    42         <service id="security.authentication.rememberme.services.persistent"  
     43 
     44        <service id="security.authentication.rememberme.services.persistent" 
    4345                 class="%security.authentication.rememberme.services.persistent.class%" 
    44                  parent="security.authentication.rememberme.services.abstract"  
    45                  abstract="true"> 
    46         </service> 
    47          
    48         <service id="security.authentication.rememberme.services.simplehash"  
    49                  class="%security.authentication.rememberme.services.simplehash.class%"  
    5046                 parent="security.authentication.rememberme.services.abstract" 
    5147                 abstract="true"> 
    5248        </service> 
    53          
     49 
     50        <service id="security.authentication.rememberme.services.simplehash" 
     51                 class="%security.authentication.rememberme.services.simplehash.class%" 
     52                 parent="security.authentication.rememberme.services.abstract" 
     53                 abstract="true"> 
     54        </service> 
     55 
    5456        <service id="security.rememberme.response_listener" class="%security.rememberme.response_listener.class%"> 
    5557            <tag name="kernel.listener" event="onCoreResponse"/> 
    5658        </service> 
    5759    </services> 
    58      
    59 </container>     
     60 
     61</container> 

  • branches/2.0/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig

    r32439 r32441  
    3131        <ul class="alt"> 
    3232            {% for log in collector.logs %} 
    33                 <li class="{{ cycle(['odd', 'even'], loop.index) }}{% if 'ERR' == log.priorityName %} error{% endif %}"> 
    34                     {{ log.priorityName }} 
     33                <li class="{{ cycle(['odd', 'even'], loop.index) }}{% if 'ERR' == log.priorityName or 'ERROR' == log.priorityName %} error{% endif %}"> 
    3534                    {{ log.message }} 
    3635                </li> 

  • branches/2.0/vendors.sh

    r32376 r32441  
    5959install_git doctrine-mongodb-odm git://github.com/doctrine/mongodb-odm.git 
    6060 
     61# Monolog 
     62install_git monolog git://github.com/Seldaek/monolog.git 
     63 
    6164# Swiftmailer 
    6265install_git swiftmailer git://github.com/swiftmailer/swiftmailer.git origin/4.1 
    …… 
    6467# Twig 
    6568install_git twig git://github.com/fabpot/Twig.git 
    66  
    67 # Zend Framework 
    68 install_git zend git://github.com/zendframework/zf2.git