Add Zest Framework

Author: steevanb

README.md

@@ -36,7 +36,7 @@ phpbenchkit --restart
 # Stop Docker container
 phpbenchkit --stop
 
-# Update docker image and phpbenchkit command
+# Update docker image and phpbenchkit command
 phpbenchkit --selfupdate
 ```
 

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "phpbenchmarks/benchmark-kit",
-    "description": "PHPBenchmarks kit to add benchmarks",
+    "description": "PHPBenchmarks kit to add benchmarks on phpbenchmarks.com",
     "license": "proprietary",
     "authors": [
         {

docker/Dockerfile

@@ -1,26 +1,11 @@
 # This container should represent the benchmark server who is not dockerised
-# So everything is installed into one container
+# So everything is installed into one container
 FROM ubuntu:18.04
 
 COPY --from=composer /usr/bin/composer /usr/local/bin/composer
-# Copy benchmark kit source code
-COPY bin/console /var/benchmark-kit/bin/console
-COPY config /var/benchmark-kit/config
-COPY documentation /var/benchmark-kit/documentation
-COPY public /var/benchmark-kit/public
-COPY src /var/benchmark-kit/src
-COPY templates /var/benchmark-kit/templates
-COPY vendor /var/benchmark-kit/vendor
-COPY .env /var/benchmark-kit/.env
-COPY changelog.md /var/benchmark-kit/changelog.md
-COPY README.md /var/benchmark-kit/README.md
-COPY phpbenchkit.sh /var/benchmark-kit/phpbenchkit.sh
-# Configure nginx default page
-COPY docker/html /var/www/html
-COPY docker/nginx/default /etc/nginx/sites-available
 
 RUN \
-    # Update and instal some dependencies
+    # Update and instal some dependencies
     apt-get update \
     && apt-get upgrade -y \
     && apt-get install -y \
@@ -61,10 +46,6 @@ RUN \
     && echo "phpbenchmarks ALL=(ALL) NOPASSWD: /usr/sbin/service php7.2-fpm restart" >> /etc/sudoers.d/phpbenchmarks \
     && echo "phpbenchmarks ALL=(ALL) NOPASSWD: /usr/sbin/service php7.3-fpm restart" >> /etc/sudoers.d/phpbenchmarks \
     && echo "phpbenchmarks ALL=(ALL) NOPASSWD: /usr/sbin/service php7.4-fpm restart" >> /etc/sudoers.d/phpbenchmarks \
-    # We have some commands to do in this directories with phpbenchmarks user.
-    # So instead of adding a lot of commands into sudoers, and as security doesn't matter in this container,
-    # change this directories mod to 777
-    && mkdir /var/benchmark-kit/var \
     && chmod -R 777 \
         /etc/nginx/sites-enabled \
         /var/log/nginx \
@@ -74,8 +55,6 @@ RUN \
         /etc/php/7.2/fpm/conf.d \
         /etc/php/7.3/fpm/conf.d \
         /etc/php/7.4/fpm/conf.d \
-        /var/benchmark-kit/public \
-        /var/benchmark-kit/var \
     # Create phpbenchmarks user, we assume final host user id will be 1000 (should be it 99% of the time)
     && useradd -ms /bin/bash --uid 1000 phpbenchmarks \
     && usermod -a -G www-data phpbenchmarks \
@@ -93,14 +72,40 @@ RUN \
     && sed -i 's/group = www-data/group = phpbenchmarks/g' /etc/php/7.3/fpm/pool.d/www.conf \
     && sed -i 's/user = www-data/user = phpbenchmarks/g' /etc/php/7.4/fpm/pool.d/www.conf \
     && sed -i 's/group = www-data/group = phpbenchmarks/g' /etc/php/7.4/fpm/pool.d/www.conf \
-    # Define PHP 7.4 as default
+    # Define PHP 7.4 as default
     && /usr/bin/update-alternatives --set php /usr/bin/php7.4 \
     # Remove nginx default page
     && rm /var/www/html/index.nginx-debian.html
 
-# Install git alone, or it will ask some geographical configs, I don't know why
+# Install git alone, or it will ask some geographical configs, I don't know why
 RUN apt-get install -y git
 
+# Copy benchmark kit source code
+COPY bin/console /var/benchmark-kit/bin/console
+COPY config /var/benchmark-kit/config
+COPY documentation /var/benchmark-kit/documentation
+COPY public /var/benchmark-kit/public
+COPY src /var/benchmark-kit/src
+COPY templates /var/benchmark-kit/templates
+COPY vendor /var/benchmark-kit/vendor
+COPY .env /var/benchmark-kit/.env
+COPY changelog.md /var/benchmark-kit/changelog.md
+COPY README.md /var/benchmark-kit/README.md
+COPY phpbenchkit.sh /var/benchmark-kit/phpbenchkit.sh
+# Configure nginx default page
+COPY docker/html /var/www/html
+COPY docker/nginx/default /etc/nginx/sites-available
+
+# Configure benchmark kit directories
+RUN \
+    mkdir /var/benchmark-kit/var \
+    # We have some commands to do in this directories with phpbenchmarks user.
+    # So instead of adding a lot of commands into sudoers, and as security doesn't matter in this container,
+    # change this directories mod to 777
+    && chmod -R 777 \
+        /var/benchmark-kit/public \
+        /var/benchmark-kit/var
+
 COPY --chown=phpbenchmarks docker/entrypoint.sh /usr/local/bin/entrypoint
 COPY docker/phpbenchkit.sh /usr/local/bin/phpbenchkit
 

phpbenchkit.sh

@@ -92,20 +92,29 @@ function startContainer() {
 
 function updatePhpBenchKitScript()
 {
+    set +e
+    docker stop phpbenchmarks_benchmark-kit_selfupdate > /dev/null 2>&1
+    set -e
+
     docker run \
         -it \
         -d \
         --name=$SELFUPDATE_CONTAINER_NAME \
         --rm \
         $DOCKER_IMAGE_NAME
-    docker cp $SELFUPDATE_CONTAINER_NAME:$BENCHMARK_KIT_PATH/phpbenchkit.sh $ROOT_DIR/$(basename $0)
+
+    local binPath="$ROOT_DIR/$(basename $0)"
+    echo -en "\e[43m sudo password could be asked to update $binPath \e[0m\n"
+    sudo docker cp $SELFUPDATE_CONTAINER_NAME:$BENCHMARK_KIT_PATH/phpbenchkit.sh "$binPath"
     docker stop $SELFUPDATE_CONTAINER_NAME
 }
 
 function stopContainer() {
     if [ $containerStarted == true ]; then
         echo -e "Stop \e[32m$CONTAINER_NAME\e[0m container."
-        docker kill $CONTAINER_NAME > /dev/null
+        set +e
+        docker kill $CONTAINER_NAME
+        set -e
     fi
 }
 

src/Component/Component.php

@@ -11,6 +11,7 @@ class Component
     public const LARAVEL = 'laravel';
     public const ZEND_FRAMEWORK = 'zend-framework';
     public const CAKE_PHP = 'cake-php';
+    public const ZEST_FRAMEWORK = 'zest-framework';
     public const TWIG = 'twig';
     public const PLATES = 'plates';
     public const SMARTY = 'smarty';
@@ -43,6 +44,10 @@ class Component
             'name' => 'CakePHP',
             'type' => ComponentType::FRAMEWORK
         ],
+        self::ZEST_FRAMEWORK => [
+            'name' => 'Zest Framework',
+            'type' => ComponentType::FRAMEWORK
+        ],
         self::TWIG => [
             'name' => 'Twig',
             'type' => ComponentType::TEMPLATE_ENGINE