PHP-66 - Update line endings to be actual LF

homiedopie · homiedopie · commit 9e1173b31ec1 · 2022-09-02T02:45:22.000+08:00
diff --git a/src/Stackify/Log/Filters/LogMsg/ErrorStackTraceMaskFilter.php b/src/Stackify/Log/Filters/LogMsg/ErrorStackTraceMaskFilter.php
@@ -23,7 +23,7 @@ public function filter(LogMsg $logMsg)
             return $logMsg;
         }
 
-        if (stripos($logMsg->getMessage(), 'stack trace:\\n') === false) {
+        if (stripos($logMsg->getMessage(), "stack trace:\n") === false) {
             return $logMsg;
         }
 
@@ -48,7 +48,7 @@ protected function mask($message)
         }
 
         try {
-            $delimeter = '\\n';
+            $delimeter = "\n";
             $hasObject = strpos($message, 'Object(') !== false; // Checks if we can detect an object(
             $messageParts = explode($delimeter, $message);
             
diff --git a/tests/Log/Builder/Fixtures/ExampleLogMsgFilterWithStackTrace.php b/tests/Log/Builder/Fixtures/ExampleLogMsgFilterWithStackTrace.php
@@ -10,7 +10,7 @@ class ExampleLogMsgFilterWithStackTrace implements LogMsgFilterable
     public function filter(LogMsg $logMsg)
     {
         $logMsg->setMessage(
-            'Stack trace:\\n : SomeExampleFunction'.$logMsg->getMessage().'(\''.$logMsg->getMessage().'\')'
+            "Stack trace:\n : SomeExampleFunction".$logMsg->getMessage()."(\'".$logMsg->getMessage()."\')"
         );
         return $logMsg;
     }
diff --git a/tests/Log/Builder/MessageBuilderTest.php b/tests/Log/Builder/MessageBuilderTest.php
@@ -95,7 +95,7 @@ public function testMaskErrorStackTraceArgumentsCreateLogMsg()
         $this->assertSame(count($messageBuilder->getLogMessageFilters()), 1);
         $logEntry = $this->createLogEntry(
             'error',
-            'Stack trace:\\n : SomeFunction(\'test\')',
+            "Stack trace:\n : SomeFunction(\'test\')",
             array(
                 'error' => new \Exception('test')
             )
@@ -105,7 +105,7 @@ public function testMaskErrorStackTraceArgumentsCreateLogMsg()
             $logEntry
         );
 
-        $this->assertSame($logMsg->getMessage(), 'Stack trace:\n : SomeFunction()');
+        $this->assertSame($logMsg->getMessage(), "Stack trace:\n : SomeFunction()");
     }
 
     public function testMaskErrorStackTraceArgumentsWithFiltersCreateLogMsg()
@@ -141,7 +141,7 @@ public function testMaskErrorStackTraceArgumentsWithFiltersCreateLogMsg()
 
         $this->assertSame(
             $logMsg->getMessage(),
-            'Stack trace:\\n : SomeExampleFunctionTest1()' // Test1 just to confirm we filter the first message on the pipeline
+            "Stack trace:\n : SomeExampleFunctionTest1()" // Test1 just to confirm we filter the first message on the pipeline
         );
     }
 
diff --git a/tests/Log/Filters/LogMsg/Fixtures/ErrorStackTraceMaskFilterInput.txt b/tests/Log/Filters/LogMsg/Fixtures/ErrorStackTraceMaskFilterInput.txt
@@ -1 +1,14 @@
-yii\\base\\ErrorException: mysqli_connect(): (HY000\/2002): No such file or directory in \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/controllers\/SiteController.php:144\nStack trace:\n#0 [internal function]: yii\\base\\ErrorHandler->handleError(2, 'mysqli_connect(...', '\/mnt\/d\/Projects...', 144, Array)\n#1 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/controllers\/SiteController.php(144): mysqli_connect('localhost', 'root', 'password')\n#2 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/controllers\/SiteController.php(138): app\\controllers\\SiteController->testWithArguments('testtest')\n#3 [internal function]: app\\controllers\\SiteController->actionTest()\n#4 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/vendor\/yiisoft\/yii2\/base\/InlineAction.php(57): call_user_func_array(Array, Array)\n#5 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/vendor\/yiisoft\/yii2\/base\/Controller.php(181): yii\\base\\InlineAction->runWithParams(Array)\n#6 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/vendor\/yiisoft\/yii2\/base\/Module.php(534): yii\\base\\Controller->runAction('test', Array)\n#7 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/vendor\/yiisoft\/yii2\/web\/Application.php(104): yii\\base\\Module->runAction('site\/test', Array)\n#8 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/vendor\/yiisoft\/yii2\/base\/Application.php(392): yii\\web\\Application->handleRequest(Object(yii\\web\\Request))\n#9 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/vendor\/yiisoft\/yii2\/base\/Application.php(392): yii\\web\\Application->handleRequest(Object(yii\\web\\Request),'test',123,Object(yii\\web\\Request))\n#10 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/web\/index.php(12): yii\\base\\Application->run()\n#11 {main}
+yii\\base\\ErrorException: mysqli_connect(): (HY000\/2002): No such file or directory in \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/controllers\/SiteController.php:144
+Stack trace:
+#0 [internal function]: yii\\base\\ErrorHandler->handleError(2, 'mysqli_connect(...', '\/mnt\/d\/Projects...', 144, Array)
+#1 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/controllers\/SiteController.php(144): mysqli_connect('localhost', 'root', 'password')
+#2 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/controllers\/SiteController.php(138): app\\controllers\\SiteController->testWithArguments('testtest')
+#3 [internal function]: app\\controllers\\SiteController->actionTest()
+#4 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/vendor\/yiisoft\/yii2\/base\/InlineAction.php(57): call_user_func_array(Array, Array)
+#5 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/vendor\/yiisoft\/yii2\/base\/Controller.php(181): yii\\base\\InlineAction->runWithParams(Array)
+#6 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/vendor\/yiisoft\/yii2\/base\/Module.php(534): yii\\base\\Controller->runAction('test', Array)
+#7 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/vendor\/yiisoft\/yii2\/web\/Application.php(104): yii\\base\\Module->runAction('site\/test', Array)
+#8 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/vendor\/yiisoft\/yii2\/base\/Application.php(392): yii\\web\\Application->handleRequest(Object(yii\\web\\Request))
+#9 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/vendor\/yiisoft\/yii2\/base\/Application.php(392): yii\\web\\Application->handleRequest(Object(yii\\web\\Request),'test',123,Object(yii\\web\\Request))
+#10 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/web\/index.php(12): yii\\base\\Application->run()
+#11 {main}
diff --git a/tests/Log/Filters/LogMsg/Fixtures/ErrorStackTraceMaskFilterOutput.txt b/tests/Log/Filters/LogMsg/Fixtures/ErrorStackTraceMaskFilterOutput.txt
@@ -1 +1,14 @@
-yii\\base\\ErrorException: mysqli_connect(): (HY000\/2002): No such file or directory in \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/controllers\/SiteController.php:144\nStack trace:\n#0 [internal function]: yii\\base\\ErrorHandler->handleError()\n#1 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/controllers\/SiteController.php(144): mysqli_connect()\n#2 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/controllers\/SiteController.php(138): app\\controllers\\SiteController->testWithArguments()\n#3 [internal function]: app\\controllers\\SiteController->actionTest()\n#4 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/vendor\/yiisoft\/yii2\/base\/InlineAction.php(57): call_user_func_array()\n#5 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/vendor\/yiisoft\/yii2\/base\/Controller.php(181): yii\\base\\InlineAction->runWithParams()\n#6 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/vendor\/yiisoft\/yii2\/base\/Module.php(534): yii\\base\\Controller->runAction()\n#7 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/vendor\/yiisoft\/yii2\/web\/Application.php(104): yii\\base\\Module->runAction()\n#8 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/vendor\/yiisoft\/yii2\/base\/Application.php(392): yii\\web\\Application->handleRequest()\n#9 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/vendor\/yiisoft\/yii2\/base\/Application.php(392): yii\\web\\Application->handleRequest()\n#10 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/web\/index.php(12): yii\\base\\Application->run()\n#11 {main}
+yii\\base\\ErrorException: mysqli_connect(): (HY000\/2002): No such file or directory in \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/controllers\/SiteController.php:144
+Stack trace:
+#0 [internal function]: yii\\base\\ErrorHandler->handleError()
+#1 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/controllers\/SiteController.php(144): mysqli_connect()
+#2 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/controllers\/SiteController.php(138): app\\controllers\\SiteController->testWithArguments()
+#3 [internal function]: app\\controllers\\SiteController->actionTest()
+#4 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/vendor\/yiisoft\/yii2\/base\/InlineAction.php(57): call_user_func_array()
+#5 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/vendor\/yiisoft\/yii2\/base\/Controller.php(181): yii\\base\\InlineAction->runWithParams()
+#6 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/vendor\/yiisoft\/yii2\/base\/Module.php(534): yii\\base\\Controller->runAction()
+#7 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/vendor\/yiisoft\/yii2\/web\/Application.php(104): yii\\base\\Module->runAction()
+#8 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/vendor\/yiisoft\/yii2\/base\/Application.php(392): yii\\web\\Application->handleRequest()
+#9 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/vendor\/yiisoft\/yii2\/base\/Application.php(392): yii\\web\\Application->handleRequest()
+#10 \/mnt\/d\/Projects\/projects-php\/samples\/yii-basic-2.0.38\/web\/index.php(12): yii\\base\\Application->run()
+#11 {main}

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public function filter(LogMsg $logMsg)`
`23`	`23`	`return $logMsg;`
`24`	`24`	`}`
`25`	`25`
`26`		`- if (stripos($logMsg->getMessage(), 'stack trace:\\n') === false) {`
	`26`	`+ if (stripos($logMsg->getMessage(), "stack trace:\n") === false) {`
`27`	`27`	`return $logMsg;`
`28`	`28`	`}`
`29`	`29`
`@@ -48,7 +48,7 @@ protected function mask($message)`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`try {`
`51`		`- $delimeter = '\\n';`
	`51`	`+ $delimeter = "\n";`
`52`	`52`	`$hasObject = strpos($message, 'Object(') !== false; // Checks if we can detect an object(`
`53`	`53`	`$messageParts = explode($delimeter, $message);`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class ExampleLogMsgFilterWithStackTrace implements LogMsgFilterable`
`10`	`10`	`public function filter(LogMsg $logMsg)`
`11`	`11`	`{`
`12`	`12`	`$logMsg->setMessage(`
`13`		`- 'Stack trace:\\n : SomeExampleFunction'.$logMsg->getMessage().'(\''.$logMsg->getMessage().'\')'`
	`13`	`+ "Stack trace:\n : SomeExampleFunction".$logMsg->getMessage()."(\'".$logMsg->getMessage()."\')"`
`14`	`14`	`);`
`15`	`15`	`return $logMsg;`
`16`	`16`	`}`