@@ -50,8 +50,7 @@ discard block |
||
50 | 50 | |
51 | 51 | if($reflectionType->isInterface() && !$reflectionClass->implementsInterface($type)){ |
52 | 52 | trigger_error($class.' does not implement '.$type); |
53 | - } |
|
54 | - elseif(!$reflectionClass->isSubclassOf($type)) { |
|
53 | + } elseif(!$reflectionClass->isSubclassOf($type)) { |
|
55 | 54 | trigger_error($class.' does not inherit '.$type); |
56 | 55 | } |
57 | 56 | |
@@ -64,8 +63,7 @@ discard block |
||
64 | 63 | } |
65 | 64 | |
66 | 65 | return $object; |
67 | - } |
|
68 | - catch(Exception $e){ |
|
66 | + } catch(Exception $e){ |
|
69 | 67 | throw new TraitException('ClassLoader: '.$e->getMessage()); |
70 | 68 | } |
71 | 69 |
@@ -60,13 +60,9 @@ |
||
60 | 60 | |
61 | 61 | if (file_exists($file)) { |
62 | 62 | $this->template = file_get_contents($file); |
63 | - } |
|
64 | - |
|
65 | - else if (file_exists($distFile)) { |
|
63 | + } else if (file_exists($distFile)) { |
|
66 | 64 | $this->template = file_get_contents($distFile); |
67 | - } |
|
68 | - |
|
69 | - else { |
|
65 | + } else { |
|
70 | 66 | throw new InvalidArgumentException( |
71 | 67 | 'Template file could not be loaded.' |
72 | 68 | ); |