Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/2422' into develop
Browse files Browse the repository at this point in the history
Forward port #2422
  • Loading branch information
weierophinney committed Oct 1, 2012
2 parents bc20a67 + 149966d commit dc818cc
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions library/Zend/Loader/AutoloaderFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public static function getRegisteredAutoloaders()
/**
* Retrieves an autoloader by class name
*
* @param string $class
* @param string $class
* @return SplAutoloader
* @throws Exception\InvalidArgumentException for non-registered class
*/
Expand Down Expand Up @@ -204,8 +204,8 @@ protected static function getStandardAutoloader()
* @see https://bugs.php.net/bug.php?id=53727
* @see https://github.com/zendframework/zf2/pull/1807
*
* @param string $className
* @param string $type
* @param string $className
* @param string $type
* @return bool
*/
protected static function isSubclassOf($className, $type)
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Loader/ClassMapAutoloader.php
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ protected function loadMapFromFile($location)
* Resolve the real_path() to a file within a phar.
*
* @see https://bugs.php.net/bug.php?id=52769
* @param string $path
* @param string $path
* @return string
*/
public static function realPharPath($path)
Expand Down
16 changes: 8 additions & 8 deletions library/Zend/Loader/ModuleAutoloader.php
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ public function autoload($class)
/**
* loadModuleFromDir
*
* @param string $dirPath
* @param string $class
* @param string $dirPath
* @param string $class
* @return mixed
* False [if unable to load $class]
* get_class($class) [if $class is successfully loaded]
Expand All @@ -212,8 +212,8 @@ protected function loadModuleFromDir($dirPath, $class)
/**
* loadModuleFromPhar
*
* @param string $pharPath
* @param string $class
* @param string $pharPath
* @param string $class
* @return mixed
* False [if unable to load $class]
* get_class($class) [if $class is successfully loaded]
Expand Down Expand Up @@ -289,7 +289,7 @@ public function unregister()
/**
* registerPaths
*
* @param array|Traversable $paths
* @param array|Traversable $paths
* @throws \InvalidArgumentException
* @return ModuleAutoloader
*/
Expand Down Expand Up @@ -318,8 +318,8 @@ public function registerPaths($paths)
/**
* registerPath
*
* @param string $path
* @param bool|string $moduleName
* @param string $path
* @param bool|string $moduleName
* @throws \InvalidArgumentException
* @return ModuleAutoloader
*/
Expand Down Expand Up @@ -355,7 +355,7 @@ public function getPaths()
/**
* Returns the base module name from the path to a phar
*
* @param string $pharPath
* @param string $pharPath
* @return string
*/
protected function pharFileToModuleName($pharPath)
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Loader/PluginClassLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public function registerPlugins($map)
/**
* Unregister a short name lookup
*
* @param mixed $shortName
* @param mixed $shortName
* @return PluginClassLoader
*/
public function unregisterPlugin($shortName)
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Loader/PluginClassLocator.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function registerPlugin($shortName, $className);
/**
* Unregister a short name lookup
*
* @param mixed $shortName
* @param mixed $shortName
* @return void
*/
public function unregisterPlugin($shortName);
Expand Down
4 changes: 2 additions & 2 deletions library/Zend/Loader/StandardAutoloader.php
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,8 @@ protected function transformClassNameToFilename($class, $directory)
/**
* Load a class, based on its type (namespaced or prefixed)
*
* @param string $class
* @param string $type
* @param string $class
* @param string $type
* @return bool|string
* @throws Exception\InvalidArgumentException
*/
Expand Down

0 comments on commit dc818cc

Please sign in to comment.