Merge pull request #145 from PrestaShop/update-dependencies

Update dependencies

.dockerignore

@@ -21,13 +21,11 @@
 .php_cs.cache
 .travis.yml
 app/config/parameters.yml
-bin/symfony_requirements
 build/
 composer.phar
 docker-compose.override.yml
 docker-compose.yml
 docker/db/data/
 vendor/
-web/index.php
 web/bundles/
 terraform/

.github/workflows/php.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.1', '7.2', '7.3']
+        php-versions: ['7.4']
     steps:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -45,7 +45,7 @@ jobs:
       run: ./vendor/bin/php-cs-fixer fix --config=.php_cs -v --dry-run
 
     - name: Lint TWIG
-      run: ./bin/console lint:twig app/Resources
+      run: ./bin/console lint:twig templates
 
     - name: Lint YAML
       run: ./bin/console lint:yaml app/config

.gitignore

@@ -21,3 +21,4 @@ var/SymfonyRequirements.php
 .idea/*
 .env
 security-checker
+.phpunit.result.cache

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.1-fpm-alpine
+FROM php:7.4-fpm-alpine
 
 RUN apk add --no-cache --virtual .persistent-deps \
 		git \

Dockerfile.prod

@@ -1,4 +1,4 @@
-FROM php:7.3-apache
+FROM php:7.4-apache
 
 ARG GH_SECURED_TOKEN
 ENV GH_SECURED_TOKEN $GH_SECURED_TOKEN

app/AppKernel.php

@@ -15,15 +15,13 @@ public function registerBundles()
             new Symfony\Bundle\TwigBundle\TwigBundle(),
             new Symfony\Bundle\MonologBundle\MonologBundle(),
             new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
-            new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
             new PrestaShop\TranslationToolsBundle\TranslationToolsBundle(),
             new AppBundle\AppBundle(),
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
             $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
             $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
-            $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
         }
 
         return $bundles;

app/config/config.yml

@@ -21,8 +21,6 @@ framework:
     csrf_protection: false
     validation:      { enable_annotations: true }
     #serializer:      { enable_annotations: true }
-    templating:
-        engines: ['twig']
     default_locale:  "%locale%"
     trusted_hosts:   ~
     session:
@@ -41,6 +39,7 @@ framework:
 twig:
     debug:            "%kernel.debug%"
     strict_variables: "%kernel.debug%"
+    exception_controller: null
 
 # Swiftmailer Configuration
 swiftmailer:

app/config/security.yml

@@ -11,4 +11,3 @@ security:
 
         main:
             anonymous: ~
-            logout_on_user_change: true

app/config/services.yml

@@ -38,30 +38,30 @@ services:
 # GitHub API
 
     Github\Api\Issue:
-        factory: 'Github\Client:api'
+        factory: ['@Github\Client', 'api']
         arguments: [issue]
 
     Github\Api\Issue\Comments:
-        factory: 'Github\Api\Issue:comments'
+        factory: ['@Github\Api\Issue', 'comments']
 
     Github\Api\PullRequest:
-        factory: 'Github\Client:api'
+        factory: ['@Github\Client', 'api']
         arguments: [pull_request]
 
     Github\Api\Repo:
-        factory: 'Github\Client:api'
+        factory: ['@Github\Client', 'api']
         arguments: [repository]
 
     Github\Api\Organization:
-        factory: 'Github\Client:api'
+        factory: ['@Github\Client', 'api']
         arguments: [organization]
 
     Github\Api\Search:
-        factory: 'Github\Client:api'
+        factory: ['@Github\Client', 'api']
         arguments: [search]
 
     Github\Api\Issue\Labels:
-        factory: 'Github\Api\Issue:labels'
+        factory: ['@Github\Api\Issue', 'labels']
 
     Github\Api\Repository\Contents:
-        factory: 'Github\Api\Repo:contents'
+        factory: ['@Github\Api\Repo', 'contents']

composer.json

@@ -21,47 +21,45 @@
         "psr-4": { "Tests\\": "tests/" }
     },
     "require": {
-        "php": ">=7.1",
+        "php": ">=7.4",
         "ext-mbstring": "*",
-        "symfony/debug-bundle": "^3.4",
-        "symfony/framework-bundle": "^3.4",
-        "symfony/web-profiler-bundle": "^3.4",
-        "symfony/security-bundle": "^3.4",
-        "symfony/twig-bundle": "^3.4",
-        "symfony/asset": "^3.4",
-        "symfony/console": "^3.4",
-        "symfony/symfony": "^3.4.26",
-        "symfony/templating": "^3.4",
-        "symfony/translation": "^3.4",
-        "symfony/validator": "^3.4",
-        "symfony/swiftmailer-bundle": "^3.1",
+        "symfony/debug-bundle": "^4.4",
+        "symfony/framework-bundle": "^4.4",
+        "symfony/web-profiler-bundle": "^4.4",
+        "symfony/security-bundle": "^4.4",
+        "symfony/twig-bundle": "^4.4",
+        "symfony/asset": "^4.4",
+        "symfony/console": "^4.4",
+        "symfony/symfony": "^4.4",
+        "symfony/templating": "^4.4",
+        "symfony/translation": "^4.4",
+        "symfony/validator": "^4.4",
+        "symfony/swiftmailer-bundle": "^3.2",
         "symfony/monolog-bundle": "^3.2",
         "symfony/polyfill-apcu": "^1.0",
-        "sensio/distribution-bundle": "^5.0",
-        "sensio/framework-extra-bundle": "^3.0.2",
         "incenteev/composer-parameter-handler": "^2.0",
         "knplabs/github-api": "^2.0",
         "php-http/guzzle6-adapter": "^1.0",
-        "prestashop/translationtools-bundle": "^4.0",
+        "prestashop/translationtools-bundle": "^5.0",
         "prestashop/github-webhook-parser": "^0.1.0",
         "twig/twig": "^1.38.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.0",
-        "symfony/phpunit-bridge": "^3.4",
-        "symfony/browser-kit": "^3.4",
+        "symfony/phpunit-bridge": "^4.4",
+        "symfony/browser-kit": "^4.4",
         "phpstan/phpstan": "^0.12"
     },
+    "config": {
+        "platform": {
+            "php": "7.4.0"
+        }
+    },
     "scripts": {
         "phpstan": "@php ./vendor/bin/phpstan analyse src tests -c phpstan.neon -l 1",
         "cs-fix": "@php ./vendor/bin/php-cs-fixer fix",
         "symfony-scripts": [
-            "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
+            "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters"
         ],
         "post-install-cmd": [
             "@symfony-scripts"