Browse Source

Update Comet up to v0.7.0 (#5764)

* Change Date header once per second

* Fix DSN string

* Remove duplicates from benchmark config
Serge Gotsuliak 5 years ago
parent
commit
c39b9a8ea7

+ 9 - 3
frameworks/PHP/comet/app.php

@@ -2,7 +2,9 @@
 declare(strict_types=1);
 declare(strict_types=1);
 
 
 use App\ORM;
 use App\ORM;
+use App\Storage;
 use Comet\Comet;
 use Comet\Comet;
+use Comet\Timer;
 use App\Controllers\DbController;
 use App\Controllers\DbController;
 use App\Controllers\QueryController;
 use App\Controllers\QueryController;
 use App\Controllers\UpdateController;
 use App\Controllers\UpdateController;
@@ -22,14 +24,18 @@ $app = new Comet([
 $app->init(
 $app->init(
     function() {
     function() {
         ORM::init();	
         ORM::init();	
+	    Storage::$date = gmdate('D, d M Y H:i:s').' GMT';
+    	Timer::add(1, function() {
+        	Storage::$date = gmdate('D, d M Y H:i:s').' GMT';
+	    });
 });
 });
 
 
 // #1 Plaintext
 // #1 Plaintext
 $app->get('/plaintext',
 $app->get('/plaintext',
     function ($request, $response) {        
     function ($request, $response) {        
         return $response
         return $response
-            ->withText('Hello, World!')
-            ->withHeader('Date', gmdate('D, d M Y H:i:s') . ' GMT');
+            ->with('Hello, World!')
+            ->withHeader('Date', Storage::$date);
 });
 });
 
 
 // #2 JSON Serialization
 // #2 JSON Serialization
@@ -37,7 +43,7 @@ $app->get('/json',
     function ($request, $response) {        
     function ($request, $response) {        
         return $response            
         return $response            
             ->with([ 'message' => 'Hello, World!' ])
             ->with([ 'message' => 'Hello, World!' ])
-            ->withHeader('Date', gmdate('D, d M Y H:i:s') . ' GMT');
+            ->withHeader('Date', Storage::$date);
 });
 });
 
 
 // #3 Single Database Query
 // #3 Single Database Query

+ 1 - 1
frameworks/PHP/comet/composer.json

@@ -1,6 +1,6 @@
 {
 {
 	"require": {
 	"require": {
-		"gotzmann/comet": "^0.6.5"
+		"gotzmann/comet": "^0.7.0"
 	},
 	},
     "autoload": {
     "autoload": {
         "psr-4": {         
         "psr-4": {         

+ 2 - 1
frameworks/PHP/comet/src/Controllers/DbController.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 namespace App\Controllers;
 namespace App\Controllers;
 
 
 use App\ORM;
 use App\ORM;
+use App\Storage;
 use Comet\Request;
 use Comet\Request;
 use Comet\Response;
 use Comet\Response;
 
 
@@ -15,7 +16,7 @@ class DbController
 
 
     	return $response
     	return $response
     		->with(ORM::$statement->fetch())
     		->with(ORM::$statement->fetch())
-	    	->withHeader('Date', gmdate('D, d M Y H:i:s') . ' GMT');
+	    	->withHeader('Date', Storage::$date);
 	}
 	}
 }
 }
 
 

+ 3 - 1
frameworks/PHP/comet/src/Controllers/FortuneController.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 namespace App\Controllers;
 namespace App\Controllers;
 
 
 use App\ORM;
 use App\ORM;
+use App\Storage;
 use Comet\Request;
 use Comet\Request;
 use Comet\Response;
 use Comet\Response;
 
 
@@ -29,7 +30,8 @@ class FortuneController
         		.$html.
         		.$html.
         		'</table></body></html>'
         		'</table></body></html>'
         	)
         	)
-        	->withHeader('Date', gmdate('D, d M Y H:i:s') . ' GMT');
+        	->withHeader('Content-Type', 'text/html; charset=utf-8')
+        	->withHeader('Date', Storage::$date);
 	}
 	}
 }
 }
 
 

+ 2 - 1
frameworks/PHP/comet/src/Controllers/QueryController.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 namespace App\Controllers;
 namespace App\Controllers;
 
 
 use App\ORM;
 use App\ORM;
+use App\Storage;
 use Comet\Request;
 use Comet\Request;
 use Comet\Response;
 use Comet\Response;
 
 
@@ -22,7 +23,7 @@ class QueryController
 
 
     	return $response
     	return $response
     		->with($arr)
     		->with($arr)
-	    	->withHeader('Date', gmdate('D, d M Y H:i:s') . ' GMT');		
+	    	->withHeader('Date', Storage::$date);		
 	}
 	}
 }
 }
 
 

+ 2 - 1
frameworks/PHP/comet/src/Controllers/UpdateController.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 namespace App\Controllers;
 namespace App\Controllers;
 
 
 use App\ORM;
 use App\ORM;
+use App\Storage;
 use Comet\Request;
 use Comet\Request;
 use Comet\Response;
 use Comet\Response;
 
 
@@ -29,7 +30,7 @@ class UpdateController
 
 
     	return $response
     	return $response
     		->with($arr)
     		->with($arr)
-	    	->withHeader('Date', gmdate('D, d M Y H:i:s') . ' GMT');		
+	    	->withHeader('Date', Storage::$date);		
 	}
 	}
 }
 }
 
 

+ 10 - 0
frameworks/PHP/comet/src/Storage.php

@@ -0,0 +1,10 @@
+<?php
+declare(strict_types=1);
+
+namespace App;
+
+class Storage
+{
+    public static $date;
+}
+