mirrors/barryvdh_laravel-ide-helper
1
0
Fork 0
mirror of https://github.com/barryvdh/laravel-ide-helper.git synced 2026-08-19 10:33:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix IDE errors

Browse Source 
Ahead of the master, but should be in sync when taylor merges the phpdoc
fixes.
This commit is contained in:
Barry
2013-03-22 10:44:53 +01:00
parent 3d6af79bf7
commit beed27073a
2 changed files with 107 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_IDE_helper.php
+104 -70
View File
@@ -122,7 +122,7 @@ namespace {
* Get the cookie creator instance used by the guard. * Get the cookie creator instance used by the guard.
* *
* @static * @static
* @return Illuminate\CookieJar * @return Illuminate\Cookie\CookieJar
*/ */
public static function getCookieJar(){ public static function getCookieJar(){
return self::$root->getCookieJar(); return self::$root->getCookieJar();
@@ -132,7 +132,7 @@ namespace {
* Set the cookie creator instance used by the guard. * Set the cookie creator instance used by the guard.
* *
* @static * @static
* @param Illuminate\CookieJar $cookie * @param Illuminate\Cookie\CookieJar $cookie
*/ */
public static function setCookieJar($cookie){ public static function setCookieJar($cookie){
self::$root->setCookieJar($cookie); self::$root->setCookieJar($cookie);
@@ -325,7 +325,7 @@ namespace {
* @param string $key * @param string $key
* @param int $minutes * @param int $minutes
* @param Closure $callback * @param Closure $callback
* @return * @return mixed
*/ */
public static function remember($key, $minutes, $callback){ public static function remember($key, $minutes, $callback){
return self::$root->remember($key, $minutes, $callback); return self::$root->remember($key, $minutes, $callback);
@@ -337,7 +337,7 @@ namespace {
* @static * @static
* @param string $key * @param string $key
* @param Closure $callback * @param Closure $callback
* @return * @return mixed
*/ */
public static function rememberForever($key, $callback){ public static function rememberForever($key, $callback){
return self::$root->rememberForever($key, $callback); return self::$root->rememberForever($key, $callback);
@@ -662,6 +662,7 @@ namespace {
* @static * @static
* @param string $query * @param string $query
* @param array $bindings * @param array $bindings
* @param $time
*/ */
public static function logQuery($query, $bindings, $time = null){ public static function logQuery($query, $bindings, $time = null){
self::$root->logQuery($query, $bindings, $time); self::$root->logQuery($query, $bindings, $time);
@@ -1002,13 +1003,16 @@ namespace {
/** /**
* Build the Redis command syntax. * Build the Redis command syntax.
*
* Redis protocol states that a command should conform to the following format: * Redis protocol states that a command should conform to the following format:
*
* *<number of arguments> CR LF * *<number of arguments> CR LF
* $<number of bytes of argument 1> CR LF * $<number of bytes of argument 1> CR LF
* <argument data> CR LF * <argument data> CR LF
* ... * ...
* $<number of bytes of argument N> CR LF * $<number of bytes of argument N> CR LF
* <argument data> CR LF * <argument data> CR LF
*
* More information regarding the Redis protocol: http://redis.io/topics/protocol * More information regarding the Redis protocol: http://redis.io/topics/protocol
* *
* @static * @static
@@ -1206,6 +1210,7 @@ namespace {
/** /**
* Resolve the given type from the container. * Resolve the given type from the container.
*
* (Overriding Container::make) * (Overriding Container::make)
* *
* @static * @static
@@ -1280,7 +1285,7 @@ namespace {
* Handle the given request and get the response. * Handle the given request and get the response.
* *
* @static * @static
* @param Illuminate\Foundation\Request $request * @param Illuminate\Http\Request $request
* @return Symfony\Component\HttpFoundation\Response * @return Symfony\Component\HttpFoundation\Response
*/ */
public static function dispatch($request){ public static function dispatch($request){
@@ -1289,10 +1294,11 @@ namespace {
/** /**
* Handle the given request and get the response. * Handle the given request and get the response.
*
* Provides compatibility with BrowserKit functional testing. * Provides compatibility with BrowserKit functional testing.
* *
* @static * @static
* @param Illuminate\Foundation\Request $request * @param Illuminate\Http\Request $request
* @param int $type * @param int $type
* @param bool $catch * @param bool $catch
* @return Symfony\Component\HttpFoundation\Response * @return Symfony\Component\HttpFoundation\Response
@@ -1334,8 +1340,8 @@ namespace {
* Prepare the request by injecting any services. * Prepare the request by injecting any services.
* *
* @static * @static
* @param Illuminate\Foundation\Request $request * @param Illuminate\Http\Request $request
* @return Illuminate\Foundation\Request * @return Illuminate\Http\Request
*/ */
public static function prepareRequest($request){ public static function prepareRequest($request){
return self::$root->prepareRequest($request); return self::$root->prepareRequest($request);
@@ -1346,7 +1352,7 @@ namespace {
* *
* @static * @static
* @param mixed $value * @param mixed $value
* @param Illuminate\Foundation\Request $request * @param Illuminate\Http\Request $request
* @return Symfony\Component\HttpFoundation\Response * @return Symfony\Component\HttpFoundation\Response
*/ */
public static function prepareResponse($value, $request){ public static function prepareResponse($value, $request){
@@ -2066,7 +2072,7 @@ namespace {
* @static * @static
* @param string $openTag * @param string $openTag
* @param string $closeTag * @param string $closeTag
* @param array $raw * @param boolean $raw
*/ */
public static function setContentTags($openTag, $closeTag, $raw = false){ public static function setContentTags($openTag, $closeTag, $raw = false){
self::$root->setContentTags($openTag, $closeTag, $raw); self::$root->setContentTags($openTag, $closeTag, $raw);
@@ -2087,6 +2093,7 @@ namespace {
* Create a new compiler instance. * Create a new compiler instance.
* *
* @static * @static
* @param Illuminate\Filesystem\Filesystem $files
* @param string $cachePath * @param string $cachePath
*/ */
public static function __construct($files, $cachePath){ public static function __construct($files, $cachePath){
@@ -2310,10 +2317,10 @@ namespace {
* Set the loader implementation. * Set the loader implementation.
* *
* @static * @static
* @return Illuminate\Config\LoaderInterface * @param Illuminate\Config\LoaderInterface $loader
*/ */
public static function setLoader($loader){ public static function setLoader($loader){
return self::$root->setLoader($loader); self::$root->setLoader($loader);
} }
/** /**
@@ -2373,10 +2380,10 @@ namespace {
* *
* @static * @static
* @param string $key * @param string $key
* @return bool * @param string $value
*/ */
public static function offsetSet($key, $value){ public static function offsetSet($key, $value){
return self::$root->offsetSet($key, $value); self::$root->offsetSet($key, $value);
} }
/** /**
@@ -2384,10 +2391,9 @@ namespace {
* *
* @static * @static
* @param string $key * @param string $key
* @return bool
*/ */
public static function offsetUnset($key){ public static function offsetUnset($key){
return self::$root->offsetUnset($key); self::$root->offsetUnset($key);
} }
/** /**
@@ -2448,7 +2454,7 @@ namespace {
* Execute an action on the controller. * Execute an action on the controller.
* *
* @static * @static
* @param Illuminate\Container $container * @param Illuminate\Container\Container $container
* @param Illuminate\Routing\Router $router * @param Illuminate\Routing\Router $router
* @param string $method * @param string $method
* @param array $parameters * @param array $parameters
@@ -2548,7 +2554,7 @@ namespace {
* @param bool $httpOnly * @param bool $httpOnly
* @return Symfony\Component\HttpFoundation\Cookie * @return Symfony\Component\HttpFoundation\Cookie
*/ */
public static function make($name, $value, $minutes = 0, $path = '/', $domain = null, $secure = false, $httpOnly = true){ public static function make($name, $value, $minutes = 0, $path = null, $domain = null, $secure = false, $httpOnly = true){
return self::$root->make($name, $value, $minutes, $path, $domain, $secure, $httpOnly); return self::$root->make($name, $value, $minutes, $path, $domain, $secure, $httpOnly);
} }
@@ -2564,7 +2570,7 @@ namespace {
* @param bool $httpOnly * @param bool $httpOnly
* @return Symfony\Component\HttpFoundation\Cookie * @return Symfony\Component\HttpFoundation\Cookie
*/ */
public static function forever($name, $value, $path = '/', $domain = null, $secure = false, $httpOnly = true){ public static function forever($name, $value, $path = null, $domain = null, $secure = false, $httpOnly = true){
return self::$root->forever($name, $value, $path, $domain, $secure, $httpOnly); return self::$root->forever($name, $value, $path, $domain, $secure, $httpOnly);
} }
@@ -2579,6 +2585,17 @@ namespace {
return self::$root->forget($name); return self::$root->forget($name);
} }
/**
* Set the default path and domain for the jar.
*
* @static
* @param string $path
* @param string $domain
*/
public static function setDefaultPathAndDomain($path, $domain){
self::$root->setDefaultPathAndDomain($path, $domain);
}
/** /**
* Get the request instance. * Get the request instance.
* *
@@ -2593,7 +2610,7 @@ namespace {
* Get the encrypter instance. * Get the encrypter instance.
* *
* @static * @static
* @return Illuminate\Encrypter * @return Illuminate\Encryption\Encrypter
*/ */
public static function getEncrypter(){ public static function getEncrypter(){
return self::$root->getEncrypter(); return self::$root->getEncrypter();
@@ -2634,7 +2651,7 @@ namespace {
* Decrypt the given value. * Decrypt the given value.
* *
* @static * @static
* @param string $value * @param string $payload
* @return string * @return string
*/ */
public static function decrypt($payload){ public static function decrypt($payload){
@@ -2757,7 +2774,7 @@ namespace {
* @static * @static
* @param string $related * @param string $related
* @param string $foreignKey * @param string $foreignKey
* @return Illuminate\Database\Eloquent\Relation\HasOne * @return Illuminate\Database\Eloquent\Relations\HasOne
*/ */
public static function hasOne($related, $foreignKey = null){ public static function hasOne($related, $foreignKey = null){
return self::$root->hasOne($related, $foreignKey); return self::$root->hasOne($related, $foreignKey);
@@ -2771,7 +2788,7 @@ namespace {
* @param string $name * @param string $name
* @param string $type * @param string $type
* @param string $id * @param string $id
* @return Illuminate\Database\Eloquent\Relation\MorphOne * @return Illuminate\Database\Eloquent\Relations\MorphOne
*/ */
public static function morphOne($related, $name, $type = null, $id = null){ public static function morphOne($related, $name, $type = null, $id = null){
return self::$root->morphOne($related, $name, $type, $id); return self::$root->morphOne($related, $name, $type, $id);
@@ -2822,7 +2839,7 @@ namespace {
* @param string $name * @param string $name
* @param string $type * @param string $type
* @param string $id * @param string $id
* @return Illuminate\Database\Eloquent\Relation\MorphMany * @return Illuminate\Database\Eloquent\Relations\MorphMany
*/ */
public static function morphMany($related, $name, $type = null, $id = null){ public static function morphMany($related, $name, $type = null, $id = null){
return self::$root->morphMany($related, $name, $type, $id); return self::$root->morphMany($related, $name, $type, $id);
@@ -3549,7 +3566,7 @@ namespace {
* Create a new event dispatcher instance. * Create a new event dispatcher instance.
* *
* @static * @static
* @param Illuminate\Container $container * @param Illuminate\Container\Container $container
*/ */
public static function __construct($container = null){ public static function __construct($container = null){
self::$root->__construct($container); self::$root->__construct($container);
@@ -3627,6 +3644,7 @@ namespace {
* @static * @static
* @param string $event * @param string $event
* @param mixed $payload * @param mixed $payload
* @param boolean $halt
*/ */
public static function fire($event, $payload = array(), $halt = false){ public static function fire($event, $payload = array(), $halt = false){
self::$root->fire($event, $payload, $halt); self::$root->fire($event, $payload, $halt);
@@ -3890,6 +3908,7 @@ namespace {
/** /**
* Recursively delete a directory. * Recursively delete a directory.
*
* The directory itself may be optionally preserved. * The directory itself may be optionally preserved.
* *
* @static * @static
@@ -4158,10 +4177,10 @@ namespace {
* Get the session store implementation. * Get the session store implementation.
* *
* @static * @static
* @param Illuminate\Session\Store $session * @return Illuminate\Session\Store
*/ */
public static function getSessionStore(){ public static function getSessionStore(){
self::$root->getSessionStore(); return self::$root->getSessionStore();
} }
/** /**
@@ -4201,6 +4220,7 @@ namespace {
* *
* @static * @static
* @param string $value * @param string $value
* @param array $options
* @return string * @return string
*/ */
public static function make($value, $options = array()){ public static function make($value, $options = array()){
@@ -4718,17 +4738,6 @@ namespace {
return self::$root->duplicate($query, $request, $attributes, $cookies, $files, $server); return self::$root->duplicate($query, $request, $attributes, $cookies, $files, $server);
} }
/**
* Clones the current request.
* Note that the session is not cloned as duplicated requests
* are most of the time sub-requests of the main one.
*
* @static
*/
public static function __clone(){
self::$root->__clone();
}
/** /**
* Returns the request as a string. * Returns the request as a string.
* *
@@ -5430,7 +5439,7 @@ namespace {
* Get a translation according to an integer value. * Get a translation according to an integer value.
* *
* @static * @static
* @param string $id * @param string $key
* @param int $number * @param int $number
* @param array $replace * @param array $replace
* @param string $locale * @param string $locale
@@ -5772,7 +5781,7 @@ namespace {
* Set the IoC container instance. * Set the IoC container instance.
* *
* @static * @static
* @param Illuminate\Container $container * @param Illuminate\Container\Container $container
*/ */
public static function setContainer($container){ public static function setContainer($container){
self::$root->setContainer($container); self::$root->setContainer($container);
@@ -5794,7 +5803,7 @@ namespace {
* @static * @static
* @param Symfony\Component\HttpFoundation\Request $request * @param Symfony\Component\HttpFoundation\Request $request
* @param Illuminate\View\Environment $view * @param Illuminate\View\Environment $view
* @param Illuminate\Translation\TranslatorInterface $trans * @param Symfony\Component\Translation\TranslatorInterface $trans
*/ */
public static function __construct($request, $view, $trans){ public static function __construct($request, $view, $trans){
self::$root->__construct($request, $view, $trans); self::$root->__construct($request, $view, $trans);
@@ -5968,9 +5977,9 @@ namespace {
* Create a new password broker instance. * Create a new password broker instance.
* *
* @static * @static
* @param Illuminate\Auth\ReminderRepositoryInterface $reminders * @param Illuminate\Auth\Reminders\ReminderRepositoryInterface $reminders
* @param Illuminate\Auth\UserProviderInterface $users * @param Illuminate\Auth\UserProviderInterface $users
* @param Illuminate\Routing\Redirector $redirector * @param Illuminate\Routing\Redirector $redirect
* @param Illuminate\Mail\Mailer $mailer * @param Illuminate\Mail\Mailer $mailer
* @param string $reminderView * @param string $reminderView
*/ */
@@ -5994,7 +6003,7 @@ namespace {
* Send the password reminder e-mail. * Send the password reminder e-mail.
* *
* @static * @static
* @param Illuminate\Auth\RemindableInterface $user * @param Illuminate\Auth\Reminders\RemindableInterface $user
* @param string $token * @param string $token
* @param Closure $callback * @param Closure $callback
*/ */
@@ -6006,8 +6015,7 @@ namespace {
* Reset the password for the given token. * Reset the password for the given token.
* *
* @static * @static
* @param string $token * @param array $credentials
* @param string $newPassword
* @param Closure $callback * @param Closure $callback
* @return mixed * @return mixed
*/ */
@@ -6020,7 +6028,7 @@ namespace {
* *
* @static * @static
* @param array $credentials * @param array $credentials
* @return Illuminate\Auth\RemindableInterface * @return Illuminate\Auth\Reminders\RemindableInterface
*/ */
public static function getUser($credentials){ public static function getUser($credentials){
return self::$root->getUser($credentials); return self::$root->getUser($credentials);
@@ -6576,17 +6584,6 @@ namespace {
return self::$root->duplicate($query, $request, $attributes, $cookies, $files, $server); return self::$root->duplicate($query, $request, $attributes, $cookies, $files, $server);
} }
/**
* Clones the current request.
* Note that the session is not cloned as duplicated requests
* are most of the time sub-requests of the main one.
*
* @static
*/
public static function __clone(){
self::$root->__clone();
}
/** /**
* Returns the request as a string. * Returns the request as a string.
* *
@@ -7314,7 +7311,7 @@ namespace {
* Create a new router instance. * Create a new router instance.
* *
* @static * @static
* @param Illuminate\Container $container * @param Illuminate\Container\Container $container
*/ */
public static function __construct($container = null){ public static function __construct($container = null){
self::$root->__construct($container); self::$root->__construct($container);
@@ -7561,7 +7558,7 @@ namespace {
* Find the patterned filters matching a request. * Find the patterned filters matching a request.
* *
* @static * @static
* @param Illuminate\Foundation\Request $request * @param Illuminate\Http\Request $request
* @return array * @return array
*/ */
public static function findPatternFilters($request){ public static function findPatternFilters($request){
@@ -7642,7 +7639,7 @@ namespace {
* *
* @static * @static
* @param mixed $value * @param mixed $value
* @param Illuminate\Foundation\Request $request * @param Illuminate\Http\Request $request
* @return Symfony\Component\HttpFoundation\Response * @return Symfony\Component\HttpFoundation\Response
*/ */
public static function prepare($value, $request){ public static function prepare($value, $request){
@@ -7903,7 +7900,7 @@ namespace {
* *
* @static * @static
* @param Illuminate\Database\Connection * @param Illuminate\Database\Connection
* @return Illuminate\Database\Schema * @return Illuminate\Database\Schema\Builder
*/ */
public static function setConnection($connection){ public static function setConnection($connection){
return self::$root->setConnection($connection); return self::$root->setConnection($connection);
@@ -7962,7 +7959,7 @@ namespace {
* Create a new Cookie based session store. * Create a new Cookie based session store.
* *
* @static * @static
* @param Illuminate\CookieJar $cookies * @param Illuminate\Cookie\CookieJar $cookies
* @param string $payload * @param string $payload
*/ */
public static function __construct($cookies, $payload = 'illuminate_payload'){ public static function __construct($cookies, $payload = 'illuminate_payload'){
@@ -8018,7 +8015,7 @@ namespace {
* Get the cookie jar instance. * Get the cookie jar instance.
* *
* @static * @static
* @return Illuminate\CookieJar * @return Illuminate\Cookie\CookieJar
*/ */
public static function getCookieJar(){ public static function getCookieJar(){
return self::$root->getCookieJar(); return self::$root->getCookieJar();
@@ -8028,7 +8025,7 @@ namespace {
* Load the session for the request. * Load the session for the request.
* *
* @static * @static
* @param Illuminate\CookieJar $cookies * @param Illuminate\Cookie\CookieJar $cookies
* @param string $name * @param string $name
*/ */
public static function start($cookies, $name){ public static function start($cookies, $name){
@@ -8475,6 +8472,30 @@ namespace {
return self::$root->limit($value, $limit, $end); return self::$root->limit($value, $limit, $end);
} }
/**
* Convert the given string to lower-case.
*
* @static
* @param string $value
* @return string
*/
public static function lower($value){
return self::$root->lower($value);
}
/**
* Limit the number of words in a string.
*
* @static
* @param string $value
* @param int $words
* @param string $end
* @return string
*/
public static function words($value, $words = 100, $end = '...'){
return self::$root->words($value, $words, $end);
}
/** /**
* Get the plural form of an English word. * Get the plural form of an English word.
* *
@@ -8500,6 +8521,7 @@ namespace {
/** /**
* Generate a "random" alpha-numeric string. * Generate a "random" alpha-numeric string.
*
* Should not be considered sufficient for cryptography, etc. * Should not be considered sufficient for cryptography, etc.
* *
* @static * @static
@@ -8510,6 +8532,17 @@ namespace {
return self::$root->quickRandom($length); return self::$root->quickRandom($length);
} }
/**
* Convert the given string to upper-case.
*
* @static
* @param string $value
* @return string
*/
public static function upper($value){
return self::$root->upper($value);
}
/** /**
* Get the singular form of an English word. * Get the singular form of an English word.
* *
@@ -8550,7 +8583,7 @@ namespace {
* *
* @static * @static
* @param string $haystack * @param string $haystack
* @param string|array $needle * @param string|array $needles
* @return bool * @return bool
*/ */
public static function startsWith($haystack, $needles){ public static function startsWith($haystack, $needles){
@@ -8627,6 +8660,7 @@ namespace {
* *
* @static * @static
* @param string $path * @param string $path
* @param array $parameters
* @return string * @return string
*/ */
public static function secure($path, $parameters = array()){ public static function secure($path, $parameters = array()){
@@ -8855,7 +8889,7 @@ namespace {
* *
* @static * @static
* @param string $view * @param string $view
* @param array $data * @param mixed $data
* @return Illuminate\View\View * @return Illuminate\View\View
*/ */
public static function make($view, $data = array()){ public static function make($view, $data = array()){
@@ -9067,7 +9101,7 @@ namespace {
* Get the view finder instance. * Get the view finder instance.
* *
* @static * @static
* @return Illuminate\View\ViewFinder * @return Illuminate\View\ViewFinderInterface
*/ */
public static function getFinder(){ public static function getFinder(){
return self::$root->getFinder(); return self::$root->getFinder();
@@ -9087,7 +9121,7 @@ namespace {
* Get the IoC container instance. * Get the IoC container instance.
* *
* @static * @static
* @return Illuminate\Container * @return Illuminate\Container\Container
*/ */
public static function getContainer(){ public static function getContainer(){
return self::$root->getContainer(); return self::$root->getContainer();
@@ -9097,7 +9131,7 @@ namespace {
* Set the IoC container instance. * Set the IoC container instance.
* *
* @static * @static
* @param Illuminate\Container $container * @param Illuminate\Container\Container $container
*/ */
public static function setContainer($container){ public static function setContainer($container){
self::$root->setContainer($container); self::$root->setContainer($container);
src/Barryvdh/LaravelIdeHelper/GeneratorCommand.php
+3
View File
@@ -136,6 +136,9 @@ class GeneratorCommand extends Command {
} }
protected function parseMethod($method){ protected function parseMethod($method){
if($method->name === '__clone'){
return '';
}
$output = ''; $output = '';
$returnAnnotations = $method->getAnnotations(array("return")); $returnAnnotations = $method->getAnnotations(array("return"));