Development

Changeset 32446

You must first sign up to be able to contribute.

Changeset 32446

Show
Ignore:
Timestamp:
04/05/11 08:15:06 (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/src/Symfony/Bundle/AsseticBundle/DependencyInjection/AsseticExtension.php

    r32434 r32446  
    6060            } else { 
    6161                $loader->load('filters/'.$name.'.xml'); 
     62            } 
     63 
     64            if (isset($filter['file'])) { 
     65                $container->getDefinition('assetic.filter.'.$name)->setFile($filter['file']); 
     66                unset($filter['file']); 
    6267            } 
    6368 

  • branches/2.0/src/Symfony/Bundle/FrameworkBundle/Debug/TraceableEventDispatcher.php

    r32445 r32446  
    4949        parent::triggerListener($listener, $eventName, $event); 
    5050 
    51         $listenerString = $this->listenerToString($listener); 
    52  
    5351        if (null !== $this->logger) { 
    54             $this->logger->debug(sprintf('Notified event "%s" to listener "%s"', $eventName, $listenerString)); 
     52            $this->logger->debug(sprintf('Notified event "%s" to listener "%s"', $eventName, get_class($listener))); 
    5553        } 
    5654 
    57         $this->called[$eventName.'.'.$listenerString] = $this->getListenerInfo($listener, $eventName); 
     55        $this->called[$eventName.'.'.get_class($listener)] = $this->getListenerInfo($listener, $eventName); 
    5856 
    5957        if ($event->isPropagationStopped() && null !== $this->logger) { 
    60             $this->logger->debug(sprintf('Listener "%s" stopped propagation of the event "%s"', $this->listenerToString($listener), $eventName)); 
     58            $this->logger->debug(sprintf('Listener "%s" stopped propagation of the event "%s"', get_class($listener), $eventName)); 
    6159 
    6260            $skippedListeners = $this->getListeners($eventName); 
    …… 
    6563            foreach ($skippedListeners as $skippedListener) { 
    6664                if ($skipped) { 
    67                     $this->logger->debug(sprintf('Listener "%s" was not called for event "%s"', $this->listenerToString($skippedListener), $eventName)); 
     65                    $this->logger->debug(sprintf('Listener "%s" was not called for event "%s"', get_class($skippedListener), $eventName)); 
    6866                } 
    6967 
    7068                if ($skippedListener === $listener) { 
    71                     $skipped = false; 
     69                    $skipped = true; 
    7270                } 
    7371            } 
    …… 
    9189        foreach (array_keys($this->getListeners()) as $name) { 
    9290            foreach ($this->getListeners($name) as $listener) { 
    93                 $listenerString = $this->listenerToString($listener); 
    94                 if (!isset($this->called[$name.'.'.$listenerString])) { 
    95                     $notCalled[$name.'.'.$listenerString] = $this->getListenerInfo($listener, $name); 
     91                if (!isset($this->called[$name.'.'.get_class($listener)])) { 
     92                    $notCalled[$name.'.'.get_class($listener)] = $this->getListenerInfo($listener, $name); 
    9693                } 
    9794            } 
    …… 
    9996 
    10097        return $notCalled; 
    101     } 
    102  
    103     protected function listenerToString($listener) 
    104     { 
    105         return $listener instanceof \Closure ? 'Closure' : get_class($listener); 
    10698    } 
    10799 

  • branches/2.0/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

    r32417 r32446  
    3232                ->scalarNode('error_handler')->end() 
    3333                ->scalarNode('exception_controller')->defaultValue('Symfony\\Bundle\\FrameworkBundle\\Controller\\ExceptionController::showAction')->end() 
    34                 ->scalarNode('ide')->end() 
     34                ->scalarNode('ide')->defaultNull()->end() 
    3535                ->booleanNode('test')->end() 
    3636            ->end() 

  • branches/2.0/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

    r32440 r32446  
    8484        $container->getDefinition('exception_listener')->setArgument(0, $config['exception_controller']); 
    8585 
    86         $pattern = ''; 
    87         if (isset($config['ide'])) { 
    88             $patterns = array( 
    89                 'textmate' => 'txmt://open?url=file://%%f&line=%%l', 
    90                 'macvim'   => 'mvim://open?url=file://%%f&line=%%l', 
    91             ); 
    92             $pattern = isset($patterns[$config['ide']]) ? $patterns[$config['ide']] : $config['ide']; 
    93         } 
    94         $container->setParameter('debug.file_link_format', $pattern); 
    95  
    9686        if (!empty($config['test'])) { 
    9787            $loader->load('test.xml'); 
    …… 
    120110 
    121111        if (isset($config['templating'])) { 
    122             $this->registerTemplatingConfiguration($config['templating'], $container, $loader); 
     112            $this->registerTemplatingConfiguration($config['templating'], $config['ide'], $container, $loader); 
    123113        } 
    124114 
    …… 
    320310     * @param XmlFileLoader    $loader    An XmlFileLoader instance 
    321311     */ 
    322     private function registerTemplatingConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader) 
     312    private function registerTemplatingConfiguration(array $config, $ide, ContainerBuilder $container, XmlFileLoader $loader) 
    323313    { 
    324314        $loader->load('templating.xml'); 
    325315        $loader->load('templating_php.xml'); 
     316 
     317        $links = array( 
     318            'textmate' => 'txmt://open?url=file://%f&line=%l', 
     319            'macvim'   => 'mvim://open?url=file://%f&line=%l', 
     320        ); 
     321 
     322        $container 
     323            ->getDefinition('templating.helper.code') 
     324            ->setArgument(0, str_replace('%', '%%', isset($links[$ide]) ? $links[$ide] : $ide)) 
     325        ; 
    326326 
    327327        if ($container->getParameter('kernel.debug')) { 

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

    r32416 r32446  
    6363        <service id="templating.helper.code" class="%templating.helper.code.class%"> 
    6464            <tag name="templating.helper" alias="code" /> 
    65             <argument>%debug.file_link_format%</argument> 
     65            <argument /> <!-- file link format --> 
    6666            <argument>%kernel.root_dir%</argument> 
    6767        </service>