Quellcode durchsuchen

Merge remote branch 'hason/frameworkbundle'

* hason/frameworkbundle:
  [HttpKernel] removed unused class
  [FrameworkBundle] fixed bugs
  [FrameworkBundle] fixed test on windows
  [FrameworkBundle] fixed CS
Fabien Potencier vor 14 Jahren
Ursprung
Commit
10297d4eb5

+ 1 - 1
src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php

@@ -137,7 +137,7 @@ EOF;
         require_once $file;
         @unlink($file);
 
-        $class = "$namespace\\$class"; 
+        $class = "$namespace\\$class";
 
         return new $class($parent->getEnvironment(), $debug);
     }

+ 1 - 1
src/Symfony/Bundle/FrameworkBundle/ContainerAwareEventDispatcher.php

@@ -62,7 +62,7 @@ class ContainerAwareEventDispatcher extends EventDispatcher
             throw new \InvalidArgumentException('Expected a string argument');
         }
 
-        foreach ((array)$events as $event) {
+        foreach ((array) $events as $event) {
             // Prevent duplicate entries
             $this->listenerIds[$event][$serviceId] = $priority;
         }

+ 1 - 1
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -76,7 +76,7 @@ class FrameworkExtension extends Extension
             } else {
                 $container
                     ->getDefinition('error_handler')->addMethodCall('register', array())
-                    ->setParameter(0, $config['error_handler'])
+                    ->setArgument(0, $config['error_handler'])
                 ;
             }
         }

+ 1 - 1
src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml

@@ -19,7 +19,7 @@
             <argument type="service" id="service_container" />
         </service>
 
-        <service id="error_handler" class="%error_handler.class%" public="false">
+        <service id="error_handler" class="%error_handler.class%">
             <argument /> <!-- level (null by default) -->
         </service>
 

+ 1 - 1
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -127,7 +127,7 @@ abstract class FrameworkExtensionTest extends TestCase
 
         $this->assertContains(
             realpath(__DIR__.'/../../Resources/translations/validators.fr.xliff'),
-            array_map(function($resource) { return $resource[1]; }, $container->getParameter('translation.resources')),
+            array_map(function($resource) { return realpath($resource[1]); }, $container->getParameter('translation.resources')),
             '->registerTranslatorConfiguration() finds FrameworkExtension translation resources'
         );
 

+ 0 - 21
src/Symfony/Component/HttpKernel/Debug/ErrorException.php

@@ -1,21 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\HttpKernel\Debug;
-
-/**
- * ErrorException.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class ErrorException extends \Exception
-{
-}