Permalink
Browse files

Merge branch 'hotfix/4744'

Close #4744
  • Loading branch information...
weierophinney committed Jun 28, 2013
2 parents dfc8b33 + 01d94f1 commit e23885794f8ffb28720c502cd8fcbb152231a488
Showing with 11 additions and 16 deletions.
  1. +1 −2 composer.json
  2. +10 −14 tests/_autoload.php
View
@@ -28,8 +28,7 @@
},
"autoload": {
"psr-0": {
- "Zend\\": "library/",
- "ZendTest\\": "tests/"
+ "Zend\\": "library/"
}
},
"bin": [
View
@@ -3,17 +3,13 @@
* Setup autoloading
*/
-if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
- include_once __DIR__ . '/../vendor/autoload.php';
-} else {
- // if composer autoloader is missing, explicitly add the ZF library path
- require_once __DIR__ . '/../library/Zend/Loader/StandardAutoloader.php';
- $loader = new Zend\Loader\StandardAutoloader(
- array(
- Zend\Loader\StandardAutoloader::LOAD_NS => array(
- 'Zend' => __DIR__ . '/../library/Zend',
- 'ZendTest' => __DIR__ . '/ZendTest',
- ),
- ));
- $loader->register();
-}
+include_once __DIR__ . '/../vendor/autoload.php';
+
+$loader = new Zend\Loader\StandardAutoloader(
+ array(
+ Zend\Loader\StandardAutoloader::LOAD_NS => array(
+ 'ZendTest' => __DIR__ . '/ZendTest',
+ ),
+ )
+);
+$loader->register();

0 comments on commit e238857

Please sign in to comment.