@@ -89,7 +89,7 @@ |
||
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | /** |
| 92 | - * @param $typeName |
|
| 92 | + * @param string $typeName |
|
| 93 | 93 | * @return array |
| 94 | 94 | */ |
| 95 | 95 | private function getVarTypeSynonyms($typeName) |
@@ -50,15 +50,21 @@ |
||
| 50 | 50 | */ |
| 51 | 51 | public function typeOf($type) |
| 52 | 52 | { |
| 53 | - if ($this->inTypesArray($type)) return true; |
|
| 53 | + if ($this->inTypesArray($type)) { |
|
| 54 | + return true; |
|
| 55 | + } |
|
| 54 | 56 | |
| 55 | 57 | $typeSynonyms = $this->getVarTypeSynonyms($type); |
| 56 | 58 | foreach ($typeSynonyms as $typeSynonym) { |
| 57 | - if ($this->inTypesArray($typeSynonym)) return true; |
|
| 59 | + if ($this->inTypesArray($typeSynonym)) { |
|
| 60 | + return true; |
|
| 61 | + } |
|
| 58 | 62 | } |
| 59 | 63 | |
| 60 | 64 | foreach ($this->types as $class) { |
| 61 | - if (is_subclass_of($type, $class)) true; |
|
| 65 | + if (is_subclass_of($type, $class)) { |
|
| 66 | + true; |
|
| 67 | + } |
|
| 62 | 68 | } |
| 63 | 69 | |
| 64 | 70 | return false; |
@@ -36,10 +36,14 @@ |
||
| 36 | 36 | |
| 37 | 37 | $parser = Registry::get($this); |
| 38 | 38 | if ($parser->has($name)) { |
| 39 | - if (!$parser->isWritable($name)) throw new \LogicException( |
|
| 39 | + if (!$parser->isWritable($name)) { |
|
| 40 | + throw new \LogicException( |
|
| 40 | 41 | sprintf('Can not set value to read only property %s::$%s', get_class($this), $name)); |
| 41 | - if (!$parser->typesAreEqual($name, $value)) throw new \LogicException( |
|
| 42 | + } |
|
| 43 | + if (!$parser->typesAreEqual($name, $value)) { |
|
| 44 | + throw new \LogicException( |
|
| 42 | 45 | sprintf('Can not set value: types mismatch %s::$%s', get_class($this), $name)); |
| 46 | + } |
|
| 43 | 47 | |
| 44 | 48 | $this->setPropertyValue($name, $value); |
| 45 | 49 | } |