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

Merge pull request #144 from szainmehdi/master

Browse Source 
Fixed class name resolution via ::class (#143,#129)
This commit is contained in:
Barry vd. Heuvel
2014-12-20 15:18:35 +01:00
parent 39ffaa62f4 5d4af73c29
commit 073d90b791
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Console/ModelsCommand.php
+11 -1
View File
@@ -333,7 +333,7 @@ class ModelsCommand extends Command
$code = substr($code, $pos + strlen($search));
$arguments = explode(',', substr($code, 0, stripos($code, ')')));
//Remove quotes, ensure 1 \ in front of the model
$returnModel = "\\" . ltrim(trim($arguments[0], " \"'"), "\\");
$returnModel = $this->getClassName($arguments[0]);
if ($relation === "belongsToMany" or $relation === 'hasMany' or $relation === 'morphMany' or $relation === 'morphToMany') {
//Collection or array of models (because Collection is Arrayable)
$this->setProperty(
@@ -507,4 +507,14 @@ class ModelsCommand extends Command
return $paramsWithDefault;
}
private function getClassName($className)
{
// If the class name was resovled via ::class (PHP 5.5+)
if(strpos($className, '::class') !== false) {
$end = -1 * strlen('::class');
return substr($className, 0, $end);
}
return "\\" . ltrim(trim($className, " \"'"), "\\") ;
}
}