@@ -2,29 +2,29 @@ |
||
2 | 2 | /** |
3 | 3 | * @const DILMUN_BASE_DIR The base directory at which Dilmun resides |
4 | 4 | */ |
5 | -define('DILMUN_BASE_DIR', dirname(dirname(dirname(__FILE__))) . "/"); |
|
5 | +define('DILMUN_BASE_DIR', dirname(dirname(dirname(__FILE__)))."/"); |
|
6 | 6 | |
7 | 7 | /** |
8 | 8 | * @const DILMUN_SOURCE_DIR The source directory |
9 | 9 | */ |
10 | -define('DILMUN_SOURCE_DIR', DILMUN_BASE_DIR . "src/"); |
|
10 | +define('DILMUN_SOURCE_DIR', DILMUN_BASE_DIR."src/"); |
|
11 | 11 | |
12 | 12 | /** |
13 | 13 | * @const DILMUN_VENDOR_DIR The vendor directory |
14 | 14 | */ |
15 | -define('DILMUN_VENDOR_DIR', DILMUN_BASE_DIR . "vendor/"); |
|
15 | +define('DILMUN_VENDOR_DIR', DILMUN_BASE_DIR."vendor/"); |
|
16 | 16 | |
17 | 17 | /** |
18 | 18 | * @const DILMUN_LOGS_DIR The log directory |
19 | 19 | */ |
20 | -define('DILMUN_LOGS_DIR', DILMUN_BASE_DIR . "app/logs/"); |
|
20 | +define('DILMUN_LOGS_DIR', DILMUN_BASE_DIR."app/logs/"); |
|
21 | 21 | |
22 | 22 | /** |
23 | 23 | * @const DILMUN_CONFIG_DIR The configurations directory |
24 | 24 | */ |
25 | -define('DILMUN_CONFIG_DIR', DILMUN_BASE_DIR . "app/config/"); |
|
25 | +define('DILMUN_CONFIG_DIR', DILMUN_BASE_DIR."app/config/"); |
|
26 | 26 | |
27 | 27 | /** |
28 | 28 | * @const DILMUN_TEST_DIR The tests directory |
29 | 29 | */ |
30 | -define('DILMUN_TEST_DIR', DILMUN_BASE_DIR . "tests/"); |
|
30 | +define('DILMUN_TEST_DIR', DILMUN_BASE_DIR."tests/"); |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | $full_file = ""; |
177 | 177 | |
178 | 178 | if (isset($this->file_path)) { |
179 | - $full_file = $this->file_path . DIRECTORY_SEPARATOR; |
|
179 | + $full_file = $this->file_path.DIRECTORY_SEPARATOR; |
|
180 | 180 | } |
181 | 181 | |
182 | 182 | $full_file .= $this->file_name; |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | |
231 | 231 | if ($locked) { |
232 | 232 | $now = date('Y-m-d H:i:s'); |
233 | - $this->file_pointer->fwrite("$now : $message" . "\r\n"); |
|
233 | + $this->file_pointer->fwrite("$now : $message"."\r\n"); |
|
234 | 234 | $this->file_pointer->flock(LOCK_UN); |
235 | 235 | |
236 | 236 | return true; |
@@ -57,7 +57,7 @@ |
||
57 | 57 | } |
58 | 58 | |
59 | 59 | /** |
60 | - * @return string|null The file_path set for the File instance |
|
60 | + * @return string The file_path set for the File instance |
|
61 | 61 | */ |
62 | 62 | public function getFilePath() |
63 | 63 | { |
@@ -218,7 +218,7 @@ |
||
218 | 218 | $replace = array(); |
219 | 219 | |
220 | 220 | foreach ($context as $key => $value) { |
221 | - $templated = "{" . $key . "}"; |
|
221 | + $templated = "{".$key."}"; |
|
222 | 222 | $replace[$templated] = $value; |
223 | 223 | } |
224 | 224 |
@@ -4,8 +4,8 @@ |
||
4 | 4 | */ |
5 | 5 | |
6 | 6 | require "config/app_constants.php"; |
7 | -require DILMUN_VENDOR_DIR . "autoload.php"; |
|
8 | -require DILMUN_SOURCE_DIR . "Nabu/Autoloader.php"; |
|
7 | +require DILMUN_VENDOR_DIR."autoload.php"; |
|
8 | +require DILMUN_SOURCE_DIR."Nabu/Autoloader.php"; |
|
9 | 9 | |
10 | 10 | /** |
11 | 11 | * @todo Pull this out somehow so that logging on bootstrap is more abstract |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | */ |
24 | 24 | public function register() |
25 | 25 | { |
26 | - spl_autoload_register(array($this,"includeClass")); |
|
26 | + spl_autoload_register(array($this, "includeClass")); |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | /** |
@@ -41,10 +41,10 @@ discard block |
||
41 | 41 | $this->updateLog("info", "Preparing package {$package} for registration with path {$path}."); |
42 | 42 | |
43 | 43 | $package = trim($package, "\\"); |
44 | - $package = $package . "\\"; |
|
44 | + $package = $package."\\"; |
|
45 | 45 | |
46 | 46 | $path = rtrim($path, DIRECTORY_SEPARATOR); |
47 | - $path = $path . "/"; |
|
47 | + $path = $path."/"; |
|
48 | 48 | |
49 | 49 | $path_registered = $this->registrationExists($package, $path); |
50 | 50 | |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | $package_stack = array(); |
83 | 83 | |
84 | 84 | foreach ($class_bits as $bit) { |
85 | - $package = $package . $bit . "\\"; |
|
85 | + $package = $package.$bit."\\"; |
|
86 | 86 | |
87 | 87 | $package_registered = $this->packageRegistered($package); |
88 | 88 | |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | |
141 | 141 | foreach ($this->packages[$package_name] as $path) { |
142 | 142 | $converted_class = str_replace('\\', DIRECTORY_SEPARATOR, $class_name); |
143 | - $class_path = $path . $converted_class . ".php"; |
|
143 | + $class_path = $path.$converted_class.".php"; |
|
144 | 144 | |
145 | 145 | $this->updateLog("debug", "Class file path is {$class_path}"); |
146 | 146 |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | $package_loaded = $this->loadPackage($package, $class_path); |
115 | 115 | |
116 | 116 | if ($package_loaded) { |
117 | - $this->updateLog("info", "Loaded {$class_path} using package {$package}"); |
|
117 | + $this->updateLog("info", "loaded {$class_path} using package {$package}"); |
|
118 | 118 | return true; |
119 | 119 | } |
120 | 120 | } |
@@ -163,9 +163,9 @@ discard block |
||
163 | 163 | $package_registered = array_key_exists($package, $this->packages); |
164 | 164 | |
165 | 165 | if ($package_registered) { |
166 | - $this->updateLog("info", "Package {$package} is registered"); |
|
166 | + $this->updateLog("info", "package {$package} is registered"); |
|
167 | 167 | } else { |
168 | - $this->updateLog("info", "Package {$package} is not registered"); |
|
168 | + $this->updateLog("info", "package {$package} is not registered"); |
|
169 | 169 | } |
170 | 170 | |
171 | 171 | return $package_registered; |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | if ($path_registered !== false) { |
191 | 191 | $path_registered = true; |
192 | 192 | |
193 | - $this->updateLog("info", "Path {$path} already registered for package {$package}"); |
|
193 | + $this->updateLog("info", "path {$path} already registered for package {$package}"); |
|
194 | 194 | } |
195 | 195 | } else { |
196 | 196 | $path_registered = false; |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | private function requireFile($path) |
211 | 211 | { |
212 | 212 | if (file_exists($path)) { |
213 | - $this->updateLog("debug", "File {$path} exists; requiring file"); |
|
213 | + $this->updateLog("debug", "file {$path} exists; requiring file"); |
|
214 | 214 | |
215 | 215 | /** @noinspection PhpIncludeInspection */ |
216 | 216 | require $path; |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | |
220 | 220 | return true; |
221 | 221 | } else { |
222 | - $this->updateLog("debug", "File {$path} does not exist"); |
|
222 | + $this->updateLog("debug", "file {$path} does not exist"); |
|
223 | 223 | |
224 | 224 | return false; |
225 | 225 | } |
@@ -32,7 +32,7 @@ |
||
32 | 32 | } else { |
33 | 33 | $this->contents = false; |
34 | 34 | |
35 | - $this->updateLog("alert", "File {$contents} not found"); |
|
35 | + $this->updateLog("alert", "file {$contents} not found"); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | return $contents_exist; |
@@ -72,7 +72,7 @@ |
||
72 | 72 | * |
73 | 73 | * @param string $table The table from which keys will be retrieved |
74 | 74 | * |
75 | - * @return array|false Returns an array of column names representing primary keys; |
|
75 | + * @return string|false Returns an array of column names representing primary keys; |
|
76 | 76 | * returns false if the table has no primary keys |
77 | 77 | */ |
78 | 78 | public function getPrimaryKeys($table) |