소스 검색

[DependencyInjection] Fixed class load order

Fixed a bug that caused a "Cannot redeclare class Symfony\Components\Routing\RouterInterface"
fatal error when booting the Symfony kernel with a populated class cache.
Brandon Turner 15 년 전
부모
커밋
8275034f5f
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      src/Symfony/Framework/DependencyInjection/KernelExtension.php
  2. 1 1
      src/Symfony/Framework/bootstrap.php

+ 1 - 1
src/Symfony/Framework/DependencyInjection/KernelExtension.php

@@ -82,8 +82,8 @@ class KernelExtension extends Extension
 
         if (!array_key_exists('compilation', $config)) {
             $classes = array(
-                'Symfony\\Components\\Routing\\Router',
                 'Symfony\\Components\\Routing\\RouterInterface',
+                'Symfony\\Components\\Routing\\Router',
                 'Symfony\\Components\\EventDispatcher\\Event',
                 'Symfony\\Components\\Routing\\Matcher\\UrlMatcherInterface',
                 'Symfony\\Components\\Routing\\Matcher\\UrlMatcher',

+ 1 - 1
src/Symfony/Framework/bootstrap.php

@@ -231,8 +231,8 @@ class KernelExtension extends Extension
 
         if (!array_key_exists('compilation', $config)) {
             $classes = array(
-                'Symfony\\Components\\Routing\\Router',
                 'Symfony\\Components\\Routing\\RouterInterface',
+                'Symfony\\Components\\Routing\\Router',
                 'Symfony\\Components\\EventDispatcher\\Event',
                 'Symfony\\Components\\Routing\\Matcher\\UrlMatcherInterface',
                 'Symfony\\Components\\Routing\\Matcher\\UrlMatcher',