Skip to content

Commit 5729c4b

Browse files
committed
$fqn replaced with $name
1 parent 2349700 commit 5729c4b

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

src/PhpGenerator/Helpers.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,19 +202,19 @@ public static function createObject($class, array $props)
202202
* @param string
203203
* @return string
204204
*/
205-
public static function extractNamespace($fqn)
205+
public static function extractNamespace($name)
206206
{
207-
return ($pos = strrpos($fqn, '\\')) ? substr($fqn, 0, $pos) : NULL;
207+
return ($pos = strrpos($name, '\\')) ? substr($name, 0, $pos) : NULL;
208208
}
209209

210210

211211
/**
212212
* @param string
213213
* @return string
214214
*/
215-
public static function extractShortName($fqn)
215+
public static function extractShortName($name)
216216
{
217-
return ($pos = strrpos($fqn, '\\')) === FALSE ? $fqn : substr($fqn, $pos + 1);
217+
return ($pos = strrpos($name, '\\')) === FALSE ? $name : substr($name, $pos + 1);
218218
}
219219

220220
}

src/PhpGenerator/PhpFile.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,35 +65,35 @@ public function addDocument($document)
6565
* @param string
6666
* @return ClassType
6767
*/
68-
public function addClass($fqn)
68+
public function addClass($name)
6969
{
7070
return $this
71-
->addNamespace(Helpers::extractNamespace($fqn))
72-
->addClass(Helpers::extractShortName($fqn));
71+
->addNamespace(Helpers::extractNamespace($name))
72+
->addClass(Helpers::extractShortName($name));
7373
}
7474

7575

7676
/**
7777
* @param string
7878
* @return ClassType
7979
*/
80-
public function addInterface($fqn)
80+
public function addInterface($name)
8181
{
8282
return $this
83-
->addNamespace(Helpers::extractNamespace($fqn))
84-
->addInterface(Helpers::extractShortName($fqn));
83+
->addNamespace(Helpers::extractNamespace($name))
84+
->addInterface(Helpers::extractShortName($name));
8585
}
8686

8787

8888
/**
8989
* @param string
9090
* @return ClassType
9191
*/
92-
public function addTrait($fqn)
92+
public function addTrait($name)
9393
{
9494
return $this
95-
->addNamespace(Helpers::extractNamespace($fqn))
96-
->addTrait(Helpers::extractShortName($fqn));
95+
->addNamespace(Helpers::extractNamespace($name))
96+
->addTrait(Helpers::extractShortName($name));
9797
}
9898

9999

src/PhpGenerator/PhpNamespace.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -100,32 +100,32 @@ public function getUses()
100100
* @throws InvalidStateException
101101
* @return self
102102
*/
103-
public function addUse($fqn, $alias = NULL, &$aliasOut = NULL)
103+
public function addUse($name, $alias = NULL, &$aliasOut = NULL)
104104
{
105-
$fqn = ltrim($fqn, '\\');
106-
if ($alias === NULL && $this->name === Helpers::extractNamespace($fqn)) {
107-
$alias = Helpers::extractShortName($fqn);
105+
$name = ltrim($name, '\\');
106+
if ($alias === NULL && $this->name === Helpers::extractNamespace($name)) {
107+
$alias = Helpers::extractShortName($name);
108108
}
109109
if ($alias === NULL) {
110-
$path = explode('\\', $fqn);
110+
$path = explode('\\', $name);
111111
$counter = NULL;
112112
do {
113113
if (empty($path)) {
114114
$counter++;
115115
} else {
116116
$alias = array_pop($path) . $alias;
117117
}
118-
} while (isset($this->uses[$alias . $counter]) && $this->uses[$alias . $counter] !== $fqn);
118+
} while (isset($this->uses[$alias . $counter]) && $this->uses[$alias . $counter] !== $name);
119119
$alias .= $counter;
120120

121-
} elseif (isset($this->uses[$alias]) && $this->uses[$alias] !== $fqn) {
121+
} elseif (isset($this->uses[$alias]) && $this->uses[$alias] !== $name) {
122122
throw new InvalidStateException(
123-
"Alias '$alias' used already for '{$this->uses[$alias]}', cannot use for '{$fqn}'."
123+
"Alias '$alias' used already for '{$this->uses[$alias]}', cannot use for '{$name}'."
124124
);
125125
}
126126

127127
$aliasOut = $alias;
128-
$this->uses[$alias] = $fqn;
128+
$this->uses[$alias] = $name;
129129
return $this;
130130
}
131131

@@ -206,14 +206,14 @@ public function __toString()
206206
{
207207
$uses = array();
208208
asort($this->uses);
209-
foreach ($this->uses as $alias => $fqn) {
210-
$useNamespace = Helpers::extractNamespace($fqn);
209+
foreach ($this->uses as $alias => $name) {
210+
$useNamespace = Helpers::extractNamespace($name);
211211

212212
if ($this->name !== $useNamespace) {
213-
if ($alias === $fqn || substr($fqn, -(strlen($alias) + 1)) === '\\' . $alias) {
214-
$uses[] = "use {$fqn};";
213+
if ($alias === $name || substr($name, -(strlen($alias) + 1)) === '\\' . $alias) {
214+
$uses[] = "use {$name};";
215215
} else {
216-
$uses[] = "use {$fqn} as {$alias};";
216+
$uses[] = "use {$name} as {$alias};";
217217
}
218218
}
219219
}

0 commit comments

Comments
 (0)