Fabien Potencier пре 15 година
родитељ
комит
aa050e2f08
2 измењених фајлова са 2 додато и 4 уклоњено
  1. 1 3
      autoload.php.dist
  2. 1 1
      src/Symfony/Framework/ZendBundle/Tests/TestCase.php

+ 1 - 3
autoload.php.dist

@@ -10,17 +10,15 @@ $loader->registerNamespaces(array(
   'Doctrine\\DBAL\\Migrations' => __DIR__.'/vendor/doctrine-migrations/lib',
   'Doctrine\\DBAL'             => __DIR__.'/vendor/doctrine/lib/vendor/doctrine-dbal/lib',
   'Doctrine'                   => __DIR__.'/vendor/doctrine/lib',
+  'Zend'                       => __DIR__.'/vendor/zend/library',
 ));
 $loader->registerPrefixes(array(
   'Swift_' => __DIR__.'/vendor/swiftmailer/lib/classes',
-  'Zend_'  => __DIR__.'/vendor/zend/library',
   'Twig_'  => __DIR__.'/vendor/twig/lib',
 ));
 $loader->register();
 
-// for Zend Framework & SwiftMailer
 set_include_path(
-    __DIR__.'/vendor/zend/library'.PATH_SEPARATOR.
     __DIR__.'/vendor/swiftmailer/lib'.PATH_SEPARATOR.
     __DIR__.'/vendor/phing/classes'.PATH_SEPARATOR.
     get_include_path()

+ 1 - 1
src/Symfony/Framework/ZendBundle/Tests/TestCase.php

@@ -15,7 +15,7 @@ class TestCase extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        if (!class_exists('Zend_Log')) {
+        if (!class_exists('Zend\\Log\\Logger')) {
             $this->markTestSkipped('Zend Framework is not available.');
         }
     }