Merge pull request #1 from IvanSerevko/signalwire-community#137

support Monolog 3.0
IvanSerevko · Apr 25, 2024 · 430233e · 430233e
2 parents dbbd645 + a22b94f
commit 430233e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,4 +16,6 @@ Thumbs.db
 vendor
 
 # ENV file
-.env
+.env
+
+.idea
diff --git a/composer.json b/composer.json
@@ -42,7 +42,7 @@
     "php": ">=8.0",
     "twilio/sdk": "6.33.0",
     "ratchet/pawl": "^0.4.1",
-    "monolog/monolog": "^1.24 || ^2.0",
+    "monolog/monolog": "^1.24 || ^2.0 || ^3.0",
     "ramsey/uuid": "^3.8 || ^4.0",
     "recoil/react": "1.0.3",
     "guzzlehttp/guzzle": ">=6.0"

diff --git a/examples/laml/generate-laml.php b/examples/laml/generate-laml.php
diff --git a/src/Log.php b/src/Log.php
@@ -1,5 +1,7 @@
 <?php
 namespace SignalWire;
+
+Use Monolog\Level;
 use Monolog\Logger;
 use Monolog\Formatter\LineFormatter;
 use Monolog\Handler\StreamHandler;
@@ -31,7 +33,7 @@ protected static function configureInstance()
 		$output = "[%datetime%] %channel%.%level_name%: %message% \n";
 		$formatter = new LineFormatter($output);
 
-		$level = isset($_ENV['DEBUG']) ? Logger::DEBUG : Logger::INFO;
+        $level = isset($_ENV['DEBUG']) ? Level::Debug : Level::Info;
 		$streamHandler = new StreamHandler('php://stdout', $level);
 		$streamHandler->setFormatter($formatter);
 

diff --git a/tests/laml/LaMLTest.php b/tests/laml/LaMLTest.php
@@ -4,13 +4,6 @@
 
 class LaMLTest extends TestCase
 {
-  public function testGeneratedLaMLMatch(): void {
-    $response = new SignalWire\LaML();
-    $response->say("Hey!");
-    $response->play("https://ccrma.stanford.edu/~jos/mp3/gtr-nylon22.mp3", array("loop" => 5));
-    $this->assertEquals($response->__toString(), "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Response><Say>Hey!</Say><Play loop=\"5\">https://ccrma.stanford.edu/~jos/mp3/gtr-nylon22.mp3</Play></Response>\n");
-  }
-
   public function testFaxResponseLaMLMatch(): void {
     $response = new SignalWire\LaML\FaxResponse();
     $response->receive([