Browse Source

[php] Fix and update Comet (#8245)

* Fix comet

* Fortunes delete withHeader() as use the default
Joan Miquel 2 years ago
parent
commit
0e77b476ef

+ 1 - 0
frameworks/PHP/comet/app.php

@@ -35,6 +35,7 @@ $app->get('/plaintext',
     function ($request, $response) {        
         return $response
             ->with('Hello, World!')
+            ->withHeader('Content-Type', 'text/plain; charset=utf-8')
             ->withHeader('Date', Storage::$date);
 });
 

+ 2 - 2
frameworks/PHP/comet/benchmark_config.json

@@ -23,7 +23,7 @@
       "display_name": "comet",
       "notes": "",
       "versus": "workerman",
-      "tags": ["broken"]
+      "tags": []
     },
     "mysql": {
       "db_url": "/db",
@@ -45,7 +45,7 @@
       "display_name": "comet-mysql",
       "notes": "",
       "versus": "workerman",
-      "tags": ["broken"]
+      "tags": []
     }
   }]
 }

+ 5 - 4
frameworks/PHP/comet/comet-mysql.dockerfile

@@ -1,11 +1,12 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
-RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq php8.1-cli php8.1-xml php8.1-mysql php8.1-mbstring > /dev/null
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
+    apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
+
+RUN apt-get install -yqq php8.1-cli php8.1-xml php8.1-mysql php8.1-mbstring > /dev/null
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 

+ 5 - 4
frameworks/PHP/comet/comet.dockerfile

@@ -1,11 +1,12 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
-RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq > /dev/null && \
-    apt-get install -yqq php8.1-cli php8.1-pgsql php8.1-xml php8.1-mbstring > /dev/null
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
+    apt-get update -yqq > /dev/null && apt-get upgrade -yqq > /dev/null
+
+RUN apt-get install -yqq php8.1-cli php8.1-pgsql php8.1-xml php8.1-mbstring > /dev/null
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 

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

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

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

@@ -30,7 +30,6 @@ class FortuneController
         		.$html.
         		'</table></body></html>'
         	)
-        	->withHeader('Content-Type', 'text/html; charset=utf-8')
         	->withHeader('Date', Storage::$date);
 	}
 }