Merge pull request #99 from PrestaShop/develop

Merge `develop` into `master`

.env.test

@@ -2,10 +2,6 @@
 KERNEL_CLASS='App\Kernel'
 APP_SECRET='$ecretf0rt3st'
 SYMFONY_DEPRECATIONS_HELPER=999999
-PANTHER_APP_ENV=panther
-PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots
 
 DATABASE_URL="mysql://root:[email protected]:3306/qanightlyresults?serverVersion=8.0.23&charset=utf8mb4"
-
-QANB_GCPURL=https://storage.googleapis.com/prestashop-core-nightly/
 QANB_TOKEN='AZERTY'

.github/workflows/php.yml

@@ -101,18 +101,20 @@ jobs:
       - name: Inject data for AutoUpgrade
         run: |
           DATE=$(date -d "2 days ago" +"%Y-%m-%d")
-          php bin/console nightly:import autoupgrade_$DATE-develop.json\
+          php bin/console nightly:import \
             -p cli \
             -c autoupgrade \
-            --env test
+            --env test \
+            autoupgrade_$DATE-develop.json
 
       - name: Inject data for Core
         run: |
           DATE=$(date -d "2 days ago" +"%Y-%m-%d")
-          php bin/console nightly:import $DATE-develop.json\
+          php bin/console nightly:import \
            -p chromium \
            -c functional \
-           --env test
+           --env test \
+           $DATE-develop.json
 
       - name: Run phpunit
         run: ./vendor/bin/phpunit

.php-cs-fixer.dist.php

@@ -2,12 +2,11 @@
 
 ini_set('memory_limit','256M');
 
-$finder = PhpCsFixer\Finder::create()->in([
-    __DIR__.'/src',
-    __DIR__.'/migrations',
-    __DIR__.'/public',
-    __DIR__.'/tests',
-]);
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__)
+    ->exclude([
+        'var',
+    ]);
 
 return (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)

Dockerfile

@@ -41,6 +41,6 @@ RUN mv /var/www/html/vhost.conf /etc/apache2/sites-enabled/000-default.conf && \
     a2enmod proxy_http && \
     a2enmod headers
 
-RUN sed -i 's/^max_execution_time = .*/max_execution_time = 300/'  /usr/local/etc/php/php.ini-production && \ 
+RUN sed -i 's/^max_execution_time = .*/max_execution_time = 3600/'  /usr/local/etc/php/php.ini-production && \ 
     sed -i 's/variables_order = "GPCS"/variables_order = "EGPCS"/' /usr/local/etc/php/php.ini-production && \ 
     mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"

README.md

@@ -9,38 +9,30 @@ Its purpose is to :
 2. let people browse a report of a test execution
 3. display some statistics about test failures
 
-## Usage
-
-Create a database following the schema provided in schema.sql at the root of the project.
-
-Don't forget to launch `composer install` to install all dependencies.
-
 ### Configuration
 
-You can create a `.env.local` file at the root of the project.
+You can create a `.env.local` file at the root of the project. You can also pass the values via environment variables. 
 
-### Configuration
+Here are the main ones:
 
-You can edit the `settings.php` file in the `src/` folder (no recommended). You can also pass the values via environment variables. Here are the main ones:
-
-|Variables          |   |
-|-------------------|---|
-| QANB_ENV          | Environment (will display errors only if set to `staging` or `testing`)  |
-| QANB_DB_HOST      | Database host address  |
-| QANB_DB_USERNAME  | Database username  |
-| QANB_DB_PASSWORD  | Database password  |
-| QANB_DB_NAME      | Database name  |
+| Variables         |                                          |
+|-------------------|------------------------------------------|
+| DATABASE_URL      | DSN for MySQL Server                     |
 | QANB_TOKEN        | Token to add JSON data through the Hook  |
-| QANB_GCPURL       | URL to the GCP repository (must ends with a `/`)  |
 
+## Usage
+
+Install dependencies with a `composer install`.
+
+Create a database with a `php bin/console doctrine:schema:update --dump-sql --force`.
 
 ## Web server configuration
 
 Set up a vhost that points to the `/public` folder (example in the `vhost.conf` file).
 
 ## Inserting new data
 
-Use the hook provided in the `Hook` controller. You need to call this URL: `BASE_URL/hook/add` with the following GET 
+Use the hook provided in the `Hook` controller. You need to call this URL: `BASE_URL/hook/reports/import` with the following GET 
 parameters:
 - `token`: the token set in the environment variable `QANB_TOKEN` (e.g.: `IpBzOmwXQUrW5Hn`)
 - `filename` : the complete filename to look for in the Google Cloud Storage (e.g.: `2019-07-22-develop.json`). The 
@@ -51,12 +43,11 @@ Optional:
 - `browser`: to specify the browser. Possible values are 'chromium' (default), 'firefox', and 'edge'.
 - `campaign`: to specify the campaign. Possible values are 'functional' (default), 'sanity', 'e2e', and 'regression'.
 
-EG : `api.mysite.com/hook/add?token=IpBzOmwXQUrW5Hn&filename=2019-07-22-develop.json`
+EG : `api.mysite.com/hook/reports/import?token=IpBzOmwXQUrW5Hn&filename=2019-07-22-develop.json`
 
 The files in the Google Cloud Storage might be huge, so be sure your server is properly configured to handle large files.
 
-Files will be taken from `https://storage.googleapis.com/prestashop-core-nightly/reports/` (unless specified otherwise 
-in the environment variable `QANB_GCPURL`).
+Files will be taken from `https://storage.googleapis.com/prestashop-core-nightly/reports/`.
 
 
 ## Containers

config/preload.php

@@ -1,5 +1,5 @@
 <?php
 
-if (file_exists(dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php')) {
-    require dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php';
+if (file_exists(dirname(__DIR__) . '/var/cache/prod/App_KernelProdContainer.preload.php')) {
+    require dirname(__DIR__) . '/var/cache/prod/App_KernelProdContainer.preload.php';
 }

config/services.yaml

@@ -4,10 +4,8 @@
 # Put parameters here that don't need to change on each machine where the app is deployed
 # https://symfony.com/doc/current/best_practices.html#use-parameters-for-application-configuration
 parameters:
-    env(QANB_GCPURL): 'https://storage.googleapis.com/prestashop-core-nightly/'
-    QANB_GCPURL: '%env(QANB_GCPURL)%'
+    QANB_GCPURL: 'https://storage.googleapis.com/prestashop-core-nightly/'
     QANB_TOKEN: '%env(QANB_TOKEN)%'
-    DATABASE_URL: '%env(resolve:DATABASE_URL)%'
 
 services:
     # default configuration for services in *this* file

docker-compose.yml

@@ -7,8 +7,5 @@ services:
     ports:
       - "80:80"
     environment:
-      QANB_BASEURL: "localhost"
-      QANB_DB_HOST: "localhost" 
-      QANB_DB_USERNAME: "myDBUser"
-      QANB_DB_PASSWORD: "myDBPasswd"
-      QANB_DB_NAME: "myDBName"
+      DATABASE_URL: "mysql://myDBUser:[email protected]:3306/myDBName?serverVersion=myDBServer&charset=utf8mb4"
+      QANB_TOKEN: "myAPIToken"