twistofreality / dilmun

src/Nabu/LoggerHandler/File.php

Doc Comments +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
     }
 
     /**
-     * @return null|string  The file_path set for the File instance
+     * @return string  The file_path set for the File instance
      */
     public function getFilePath()
     {

Spacing +2 added lines, -2 removed lines

@@ -176,7 +176,7 @@ 
         $full_file = "";
 
         if (isset($this->file_path)) {
-            $full_file = $this->file_path . DIRECTORY_SEPARATOR;
+            $full_file = $this->file_path.DIRECTORY_SEPARATOR;
         }
 
         $full_file .= $this->file_name;
@@ -229,7 +229,7 @@ 
 
         if ($locked) {
             $now = date('Y-m-d H:i:s');
-            $this->file_pointer->fwrite("$now : $message" . "\r\n");
+            $this->file_pointer->fwrite("$now : $message"."\r\n");
             $this->file_pointer->flock(LOCK_UN);
 
             return true;

app/config/app_constants.php

Spacing +6 added lines, -6 removed lines

@@ -2,29 +2,29 @@
 /**
  * @const DILMUN_BASE_DIR The base directory at which Dilmun resides
  */
-define('DILMUN_BASE_DIR', dirname(dirname(dirname(__FILE__))) . "/");
+define('DILMUN_BASE_DIR', dirname(dirname(dirname(__FILE__)))."/");
 
 /**
  * @const DILMUN_SOURCE_DIR The source directory
  */
-define('DILMUN_SOURCE_DIR', DILMUN_BASE_DIR . "src/");
+define('DILMUN_SOURCE_DIR', DILMUN_BASE_DIR."src/");
 
 /**
  * @const DILMUN_VENDOR_DIR The vendor directory
  */
-define('DILMUN_VENDOR_DIR', DILMUN_BASE_DIR . "vendor/");
+define('DILMUN_VENDOR_DIR', DILMUN_BASE_DIR."vendor/");
 
 /**
  * @const DILMUN_LOGS_DIR The log directory
  */
-define('DILMUN_LOGS_DIR', DILMUN_BASE_DIR . "app/logs/");
+define('DILMUN_LOGS_DIR', DILMUN_BASE_DIR."app/logs/");
 
 /**
  * @const DILMUN_CONFIG_DIR The configurations directory
  */
-define('DILMUN_CONFIG_DIR', DILMUN_BASE_DIR . "app/config/");
+define('DILMUN_CONFIG_DIR', DILMUN_BASE_DIR."app/config/");
 
 /**
  * @const DILMUN_TEST_DIR The tests directory
  */
-define('DILMUN_TEST_DIR', DILMUN_BASE_DIR . "tests/");
+define('DILMUN_TEST_DIR', DILMUN_BASE_DIR."tests/");

app/bootstrap.php

Spacing +6 added lines, -6 removed lines

@@ -4,14 +4,14 @@
  */
 
 require "config/app_constants.php";
-require DILMUN_VENDOR_DIR . "autoload.php";
-require DILMUN_SOURCE_DIR . "Nabu/Autoloader.php";
+require DILMUN_VENDOR_DIR."autoload.php";
+require DILMUN_SOURCE_DIR."Nabu/Autoloader.php";
 
 //Pre-load logger classes for autoloader logging!
-require DILMUN_SOURCE_DIR . "Nabu/Logger.php";
-require DILMUN_SOURCE_DIR . "Nabu/StaticLogger.php";
-require DILMUN_SOURCE_DIR . "Nabu/LoggerHandler/HandlerInterface.php";
-require DILMUN_SOURCE_DIR . "Nabu/LoggerHandler/File.php";
+require DILMUN_SOURCE_DIR."Nabu/Logger.php";
+require DILMUN_SOURCE_DIR."Nabu/StaticLogger.php";
+require DILMUN_SOURCE_DIR."Nabu/LoggerHandler/HandlerInterface.php";
+require DILMUN_SOURCE_DIR."Nabu/LoggerHandler/File.php";
 
 use Subreality\Dilmun\Nabu\Autoloader as std_loader;
 

tests/Nabu/StaticLoggerTest.php

Spacing +9 added lines, -9 removed lines

@@ -16,9 +16,9 @@ 
 
     public static function setUpBeforeClass()
     {
-        self::$full_log_location = DILMUN_LOGS_DIR . "StaticLogger_test.log";
+        self::$full_log_location = DILMUN_LOGS_DIR."StaticLogger_test.log";
 
-        if(file_exists(self::$full_log_location))
+        if (file_exists(self::$full_log_location))
         {
             unlink(self::$full_log_location);
         }
@@ -34,7 +34,7 @@ 
 
     protected function setUp()
     {
-        if(file_exists(self::$full_log_location))
+        if (file_exists(self::$full_log_location))
         {
             self::$log_file->clearFile();
         }
@@ -46,7 +46,7 @@ 
 
     public static function tearDownAfterClass()
     {
-        if(file_exists(self::$full_log_location))
+        if (file_exists(self::$full_log_location))
         {
             unlink(self::$full_log_location);
         }
@@ -96,7 +96,7 @@ 
 
         $expected_context_message = "Here is some stuff for ya.";
 
-        $returned_message = static_logger::log("debug","Here is some {context} for ya.",$context_array);
+        $returned_message = static_logger::log("debug", "Here is some {context} for ya.", $context_array);
 
         $this->assertContains($expected_context_message, $returned_message);
     }
@@ -112,7 +112,7 @@ 
         //affecting the {context} section and not throw any exceptions.
         $expected_context_message = "Here is some {context} for ya.";
 
-        $returned_message = static_logger::log("debug","Here is some {context} for ya.",$context_array);
+        $returned_message = static_logger::log("debug", "Here is some {context} for ya.", $context_array);
 
         $this->assertContains($expected_context_message, $returned_message);
     }
@@ -121,7 +121,7 @@ 
     {
         static_logger::setHandler(self::$log_file);
 
-        try{
+        try {
             throw new \Exception("This is an arbitrary exception");
         }
         catch (\Exception $e)
@@ -136,7 +136,7 @@ 
 
         $expected_context_message = 'The Exception processor provides line, file (/home/derek/PHP/Subreality/Dilmun/tests/Nabu/StaticLoggerTest.php), and message (This is an arbitrary exception)';
 
-        $returned_message = static_logger::log("debug",$log_message,$context_array);
+        $returned_message = static_logger::log("debug", $log_message, $context_array);
 
         $this->assertContains($expected_context_message, $returned_message);
     }
@@ -154,7 +154,7 @@ 
         //affecting the {context} section and not throw any exceptions.
         $expected_context_message = "Here is some {context} for ya.";
 
-        $returned_message = static_logger::log("debug","Here is some {context} for ya.",$context_array);
+        $returned_message = static_logger::log("debug", "Here is some {context} for ya.", $context_array);
 
         $this->assertContains($expected_context_message, $returned_message);
     }

Braces +1 added lines, -2 removed lines

@@ -123,8 +123,7 @@
 
         try{
             throw new \Exception("This is an arbitrary exception");
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $context_array = array(
                 "exception" =>  $e

tests/Nabu/LoggerTest.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 
     public static function setUpBeforeClass()
     {
-        self::$full_log_location = DILMUN_LOGS_DIR . "Logger_test.log";
+        self::$full_log_location = DILMUN_LOGS_DIR."Logger_test.log";
 
         if (file_exists(self::$full_log_location)) {
             unlink(self::$full_log_location);

tests/Nabu/AutoloaderTest.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 
     public static function setUpBeforeClass()
     {
-        self::$autoloader_log_location = DILMUN_LOGS_DIR . "autoloader.log";
+        self::$autoloader_log_location = DILMUN_LOGS_DIR."autoloader.log";
 
         //Creating a pointed to the existing log file.
         $autoloader_file = new File("autoloader.log", DILMUN_LOGS_DIR);
@@ -91,7 +91,7 @@ 
         /** @noinspection PhpUnusedLocalVariableInspection */
         $stub = new TestClass();
 
-        $autoloader_log = file_get_contents(DILMUN_LOGS_DIR . "autoloader.log");
+        $autoloader_log = file_get_contents(DILMUN_LOGS_DIR."autoloader.log");
 
         $this->assertContains("TestClass", $autoloader_log);
     }

tests/Nabu/LoggerHandler/FileTest.php

Spacing +4 added lines, -4 removed lines

@@ -18,9 +18,9 @@ 
     {
         self::$log_file_name = "File_test.log";
         self::$log_file_path = DILMUN_LOGS_DIR;
-        self::$full_log_location = DILMUN_LOGS_DIR . "File_test.log";
+        self::$full_log_location = DILMUN_LOGS_DIR."File_test.log";
 
-        if(file_exists(self::$full_log_location))
+        if (file_exists(self::$full_log_location))
         {
             unlink(self::$full_log_location);
         }
@@ -33,7 +33,7 @@ 
 
     protected function setUp()
     {
-        if(file_exists(self::$full_log_location))
+        if (file_exists(self::$full_log_location))
         {
             unlink(self::$full_log_location);
         }
@@ -41,7 +41,7 @@ 
 
     public static function tearDownAfterClass()
     {
-        if(file_exists(self::$full_log_location))
+        if (file_exists(self::$full_log_location))
         {
             unlink(self::$full_log_location);
         }

src/Nabu/StaticLogger.php

Spacing +1 added lines, -1 removed lines

@@ -165,7 +165,7 @@
         $replace = array();
 
         foreach ($context as $key => $value) {
-            $templated = "{" . $key . "}";
+            $templated = "{".$key."}";
             $replace[$templated] = $value;
         }
 

src/Nabu/Autoloader.php

Spacing +5 added lines, -5 removed lines

@@ -33,7 +33,7 @@ 
      */
     public function register()
     {
-        spl_autoload_register(array($this,"includeClass"));
+        spl_autoload_register(array($this, "includeClass"));
     }
 
     /**
@@ -46,10 +46,10 @@ 
         $this->logger->debug("Inputs: package: {$package}, path: {$path}");
 
         $package = trim($package, "\\");
-        $package = $package . "\\";
+        $package = $package."\\";
 
         $path = rtrim($path, "/");
-        $path = $path . "/";
+        $path = $path."/";
 
         $this->logger->debug("Registering index {$package} with {$path}");
         $this->packages[$package][] = $path;
@@ -127,13 +127,13 @@ 
 
             foreach ($this->packages[$package_name] as $path) {
                 $converted_class = str_replace('\\', '/', $class_name);
-                $class_path = $path . $converted_class . ".php";
+                $class_path = $path.$converted_class.".php";
                 $this->logger->debug("Set up class path as {$class_path}");
 
                 if (file_exists($class_path)) {
                     $this->logger->debug("File {$class_path} exists");
 
-                    $this->logger->debug("Including " . $class_path);
+                    $this->logger->debug("Including ".$class_path);
                     /** @noinspection PhpIncludeInspection */
                     include $class_path;