Updates for CakePHP 4.4. (#7716)

Consolidated all actions into a single controller.

Author: ADmad

frameworks/PHP/cakephp/benchmark_config.json

@@ -20,7 +20,7 @@
             "webserver": "nginx",
             "os": "Linux",
             "database_os": "Linux",
-            "display_name": "CakePHP",
+            "display_name": "CakePHP 4.4",
             "notes": "",
             "versus": "php"
         },

frameworks/PHP/cakephp/cakephp-workerman.dockerfile

@@ -19,15 +19,12 @@ EXPOSE 8080
 ADD ./ /cakephp
 WORKDIR /cakephp
 
-RUN composer install --optimize-autoloader --classmap-authoritative --no-dev  --quiet
 RUN composer require joanhey/adapterman:^0.5
+RUN composer install --optimize-autoloader --classmap-authoritative --no-dev  --quiet
 
 RUN chmod -R 777 /cakephp
 
 #COPY deploy/conf/cli-php.ini /etc/php/8.1/cli/php.ini
 
-# bypass cli bootstrap for Workerman
-RUN sed -i "s|//$isCli = false|$isCli = false|g" config/bootstrap.php
-
 CMD php -c deploy/conf/cli-php.ini \
     server.php start

frameworks/PHP/cakephp/config/app.php

@@ -170,7 +170,6 @@
      */
     'Error' => [
         'errorLevel' => E_ALL,
-        'exceptionRenderer' => 'Cake\Error\ExceptionRenderer',
         'skipLog' => [],
         'log' => true,
         'trace' => true,

frameworks/PHP/cakephp/config/bootstrap.php

@@ -30,18 +30,17 @@
 require CORE_PATH . 'config' . DS . 'bootstrap.php';
 
 use Cake\Cache\Cache;
-use Cake\Console\ConsoleErrorHandler;
 use Cake\Core\Configure;
 use Cake\Core\Configure\Engine\PhpConfig;
-use Cake\Core\Plugin;
-use Cake\Database\Type;
+use Cake\Database\Type\StringType;
+use Cake\Database\TypeFactory;
 use Cake\Datasource\ConnectionManager;
-use Cake\Error\ErrorHandler;
-use Cake\Http\ServerRequest;
+use Cake\Error\ErrorTrap;
+use Cake\Error\ExceptionTrap;
 use Cake\Log\Log;
 use Cake\Mailer\Mailer;
 use Cake\Mailer\TransportFactory;
-use Cake\Utility\Inflector;
+use Cake\Routing\Router;
 use Cake\Utility\Security;
 
 /**
@@ -114,20 +113,8 @@
 /*
  * Register application error and exception handlers.
  */
-$isCli = PHP_SAPI === 'cli';
-//$isCli = false; // Workerman
-if ($isCli) {
-    (new ConsoleErrorHandler(Configure::read('Error')))->register();
-} else {
-    (new ErrorHandler(Configure::read('Error')))->register();
-}
-
-/*
- * Include the CLI bootstrap overrides.
- */
-if ($isCli) {
-    require __DIR__ . '/bootstrap_cli.php';
-}
+(new ErrorTrap(Configure::read('Error')))->register();
+(new ExceptionTrap(Configure::read('Error')))->register();
 
 /*
  * Set the full base URL.
@@ -187,6 +174,9 @@
 // TypeFactory::build('timestamptimezone')
 //    ->useMutable();
 
+// There is no time-specific type in Cake
+TypeFactory::map('time', StringType::class);
+
 /*
  * Custom Inflector rules, can be set to correctly pluralize or singularize
  * table, model, controller names or whatever other string is passed to the

frameworks/PHP/cakephp/config/bootstrap_cli.php

@@ -49,11 +49,11 @@ public function middleware(MiddlewareQueue $middlewareQueue): MiddlewareQueue
 
     public function routes(RouteBuilder $routes): void
     {
-        $routes->connect('/json', ['controller' => 'Json', 'action' => 'index']);
-        $routes->connect('/plaintext', ['controller' => 'Plaintext', 'action' => 'index']);
-        $routes->connect('/fortunes', ['controller' => 'Fortunes', 'action' => 'index']);
-        $routes->connect('/db', ['controller' => 'World', 'action' => 'query']);
-        $routes->connect('/queries', ['controller' => 'World', 'action' => 'index']);
-        $routes->connect('/updates', ['controller' => 'World', 'action' => 'updates']);
-    }    
+        $routes->connect('/json', ['controller' => 'Main', 'action' => 'json']);
+        $routes->connect('/plaintext', ['controller' => 'Main', 'action' => 'plaintext']);
+        $routes->connect('/fortunes', ['controller' => 'Main', 'action' => 'fortunes']);
+        $routes->connect('/db', ['controller' => 'Main', 'action' => 'db']);
+        $routes->connect('/queries', ['controller' => 'Main', 'action' => 'queries']);
+        $routes->connect('/updates', ['controller' => 'Main', 'action' => 'updates']);
+    }
 }

frameworks/PHP/cakephp/config/cacert.pem

@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Controller;
+
+use Cake\Controller\Controller;
+
+class MainController extends Controller
+{
+    public function json()
+    {
+        $data = ['message' => 'Hello, World!'];
+
+        return $this->_jsonResponse($data);
+    }
+
+    public function db()
+    {
+        $world = $this->fetchTable('World')->get(self::_randomInt());
+
+        return $this->_jsonResponse($world);
+    }
+
+    public function fortunes()
+    {
+        // Calling all() will execute the query
+        // and return the result set.
+        $fortunes = $this->fetchTable('Fortune')->find()->all();
+
+        // stuffing in the dynamic data
+        $fortune = $this->fetchTable('Fortune')->newEntity([
+            'id' => 0,
+            'message' => 'Additional fortune added at request time.',
+        ]);
+
+        $fortunes = $fortunes->appendItem($fortune);
+
+        $fortunes = $fortunes->sortBy('message', SORT_ASC, SORT_STRING)->compile(false);
+
+        $this->set('fortunes', $fortunes);
+    }
+
+    public function queries()
+    {
+        // Create an array with the response string.
+        $worlds = [];
+        $queries = $this->_getQueryCount();
+        $worldRepo = $this->fetchTable('World');
+
+        // For each query, store the result set values in the response array
+        while ($queries--) {
+            $worlds[] = $worldRepo->get(self::_randomInt());
+        }
+
+        return $this->_jsonResponse($worlds);
+    }
+
+    public function updates()
+    {
+        // Create an array with the response string.
+        $worlds = [];
+        $queries = $this->_getQueryCount();
+        $worldRepo = $this->fetchTable('World');
+
+        // For each query, store the result set values in the response array
+        while ($queries--) {
+            $world = $worldRepo->get(self::_randomInt());
+            $world->randomNumber = self::_randomInt();
+
+            $worldRepo->save($world);
+            $worlds[] = $world;
+        }
+
+        return $this->_jsonResponse($worlds);
+    }
+
+    public function plaintext()
+    {
+        return $this->response
+            ->withStringBody('Hello, World!')
+            ->withType('text/plain');
+    }
+
+    protected function _jsonResponse($data)
+    {
+        return $this->response
+            ->withType('application/json')
+            ->withStringBody(\json_encode($data));
+    }
+
+    protected function _getQueryCount()
+    {
+        $queries = (int)$this->request->getQuery('queries');
+
+        if ($queries === 0) {
+            $queries = 1;
+        } elseif ($queries > 500) {
+            $queries = 500;
+        }
+
+        return $queries;
+    }
+
+    protected static function _randomInt()
+    {
+        return random_int(1, 10000);
+    }
+}