Completed
Pull Request — master (#1936)
by
unknown
02:11
created
core/traits/ErrorHandlerTrait.php 2 patches
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
      *
68 68
      * @param string $message The message you want to send to the error api server.
69 69
      * @param string $file The you are currently send the message (use __FILE__)
70
-     * @param string $line The line you want to submit (use __LINE__)
70
+     * @param integer $line The line you want to submit (use __LINE__)
71 71
      * @return bool|null
72 72
      */
73 73
     public function transferMessage($message, $file = __FILE__, $line = __LINE__)
@@ -105,6 +105,7 @@  discard block
 block discarded – undo
105 105
     
106 106
     /**
107 107
      * @inheritdoc
108
+     * @param \Exception $exception
108 109
      */
109 110
     public function renderException($exception)
110 111
     {
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -148,9 +148,9 @@  discard block
 block discarded – undo
148 148
             $_file = $exception->getFile();
149 149
             $_line = $exception->getLine();
150 150
         } elseif (is_string($exception)) {
151
-            $_message = 'exception string: ' . $exception;
151
+            $_message = 'exception string: '.$exception;
152 152
         } elseif (is_array($exception)) {
153
-            $_message = isset($exception['message']) ? $exception['message'] : 'exception array dump: ' . print_r($exception, true);
153
+            $_message = isset($exception['message']) ? $exception['message'] : 'exception array dump: '.print_r($exception, true);
154 154
             $_file = isset($exception['file']) ? $exception['file'] : __FILE__;
155 155
             $_line = isset($exception['line']) ? $exception['line'] : __LINE__;
156 156
         }
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 
216 216
         if (!empty($file)) {
217 217
             try {
218
-                $lineInArray = $line -1;
218
+                $lineInArray = $line - 1;
219 219
                 // load file from path
220 220
                 $fileInfo = file($file, FILE_IGNORE_NEW_LINES);
221 221
                 // load file if false from real path
Please login to merge, or discard this patch.
core/theme/ThemeConfig.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -97,6 +97,6 @@
 block discarded – undo
97 97
     
98 98
     public function getViewPath()
99 99
     {
100
-        return $this->getBasePath() . '/views';
100
+        return $this->getBasePath().'/views';
101 101
     }
102 102
 }
103 103
\ No newline at end of file
Please login to merge, or discard this patch.
core/theme/Theme.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
         }
65 65
     
66 66
         $pos = strpos($viewPath, '/');
67
-        $rootPath = $pos === false ? $viewPath : (substr($viewPath, 0, $pos) . '/views');
67
+        $rootPath = $pos === false ? $viewPath : (substr($viewPath, 0, $pos).'/views');
68 68
         $this->pathMap[$rootPath] = $pathMap;
69 69
     
70 70
         $this->pathMap['@app/views'] = $pathMap;
@@ -84,17 +84,17 @@  discard block
 block discarded – undo
84 84
     
85 85
     public function getLayoutPath()
86 86
     {
87
-        return $this->viewPath . '/' . self::LAYOUTS_PATH;
87
+        return $this->viewPath.'/'.self::LAYOUTS_PATH;
88 88
     }
89 89
     
90 90
     public function getLayoutFile()
91 91
     {
92
-        return $this->layoutPath . '/' . $this->layout . '.php';
92
+        return $this->layoutPath.'/'.$this->layout.'.php';
93 93
     }
94 94
     
95 95
     public function getResourcePath()
96 96
     {
97
-        return $this->basePath . '/' . self::RESOURCES_PATH;
97
+        return $this->basePath.'/'.self::RESOURCES_PATH;
98 98
     }
99 99
     
100 100
     public function getConfig()
Please login to merge, or discard this patch.