@@ -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/"); |
|
@@ -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 | |
@@ -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 | |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | $full_file = ""; |
| 122 | 122 | |
| 123 | 123 | if (isset($this->file_path)) { |
| 124 | - $full_file = $this->file_path . DIRECTORY_SEPARATOR; |
|
| 124 | + $full_file = $this->file_path.DIRECTORY_SEPARATOR; |
|
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | $full_file .= $this->file_name; |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | |
| 157 | 157 | if ($file_writable) { |
| 158 | 158 | $now = date('Y-m-d H:i:s'); |
| 159 | - $this->file_pointer->fwrite("$now : $message" . "\r\n"); |
|
| 159 | + $this->file_pointer->fwrite("$now : $message"."\r\n"); |
|
| 160 | 160 | $this->file_pointer->flock(LOCK_UN); |
| 161 | 161 | |
| 162 | 162 | $message_written = true; |
@@ -1,7 +1,7 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | require "config/app_constants.php"; |
| 3 | -require DILMUN_VENDOR_DIR . "autoload.php"; |
|
| 4 | -require DILMUN_SOURCE_DIR . "Nabu/Autoloader.php"; |
|
| 3 | +require DILMUN_VENDOR_DIR."autoload.php"; |
|
| 4 | +require DILMUN_SOURCE_DIR."Nabu/Autoloader.php"; |
|
| 5 | 5 | |
| 6 | 6 | use Subreality\Dilmun\Nabu\Autoloader; |
| 7 | 7 | use Subreality\Dilmun\Nabu\Logger; |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | public function affectChunks(callable $function, ...$delimiters) |
| 37 | 37 | { |
| 38 | 38 | $delimiter_string = ""; |
| 39 | - $replace_callback = function ($matches) use ($function) { |
|
| 39 | + $replace_callback = function($matches) use ($function) { |
|
| 40 | 40 | |
| 41 | 41 | $callback_string = $function($matches[0]); |
| 42 | 42 | |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | */ |
| 65 | 65 | public function startsWith($string) |
| 66 | 66 | { |
| 67 | - $pattern = "/^" . preg_quote($string, "/") . "/"; |
|
| 67 | + $pattern = "/^".preg_quote($string, "/")."/"; |
|
| 68 | 68 | |
| 69 | 69 | $starts_with_string = preg_match($pattern, $this->string); |
| 70 | 70 | |
@@ -86,12 +86,12 @@ discard block |
||
| 86 | 86 | public function collapseStartingRepetition($string) |
| 87 | 87 | { |
| 88 | 88 | $matches = array(); |
| 89 | - $pattern = "/^[" . preg_quote($string, "/") . "]+(?P<remainder>.*)/"; |
|
| 89 | + $pattern = "/^[".preg_quote($string, "/")."]+(?P<remainder>.*)/"; |
|
| 90 | 90 | |
| 91 | 91 | $starts_with_string = preg_match($pattern, $this->string, $matches); |
| 92 | 92 | |
| 93 | 93 | if ($starts_with_string) { |
| 94 | - $collapsed_string = $string . $matches["remainder"]; |
|
| 94 | + $collapsed_string = $string.$matches["remainder"]; |
|
| 95 | 95 | |
| 96 | 96 | return $collapsed_string; |
| 97 | 97 | } else { |
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | $uri_fragment = parent::toUriString(); //returns data string |
| 53 | 53 | |
| 54 | 54 | if (!empty($uri_fragment)) { |
| 55 | - $uri_fragment = "#" . $uri_fragment; |
|
| 55 | + $uri_fragment = "#".$uri_fragment; |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | return $uri_fragment; |
@@ -135,11 +135,11 @@ |
||
| 135 | 135 | |
| 136 | 136 | $this->part_pattern = preg_quote($valid_character_string, "/"); |
| 137 | 137 | |
| 138 | - self::$valid_pattern = '/^$|' . //allows part to be empty |
|
| 139 | - '^([\w' . //start decoded group |
|
| 140 | - $this->part_pattern . |
|
| 141 | - ']|' . //predefined patterns or percent-encoding |
|
| 142 | - $this->pct_encoded_pattern . |
|
| 138 | + self::$valid_pattern = '/^$|'.//allows part to be empty |
|
| 139 | + '^([\w'.//start decoded group |
|
| 140 | + $this->part_pattern. |
|
| 141 | + ']|'.//predefined patterns or percent-encoding |
|
| 142 | + $this->pct_encoded_pattern. |
|
| 143 | 143 | ')*$/'; |
| 144 | 144 | } |
| 145 | 145 | |
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | $uri_query = parent::toUriString(); //returns data string |
| 53 | 53 | |
| 54 | 54 | if (!empty($uri_query)) { |
| 55 | - $uri_query = "?" . $uri_query; |
|
| 55 | + $uri_query = "?".$uri_query; |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | return $uri_query; |