Commit 79553168 authored by Arnaud Bey's avatar Arnaud Bey

update symfo to 4.4.* & misc. fixes

parent c3deca25
......@@ -3,7 +3,6 @@ init: install cache
update-prod:
composer install --prefer-source
php bin/console fos:js-routing:dump --format=json --target=public/routes/fos_js_routes.json
php bin/console bazinga:js-translation:dump
npm install
npm run build
php bin/console doctrine:schema:update --force
......@@ -15,7 +14,6 @@ update-prod:
update-dev:
composer install --prefer-source
php bin/console fos:js-routing:dump --format=json --target=public/routes/fos_js_routes.json
php bin/console bazinga:js-translation:dump
npm install
npm run dev
php bin/console doctrine:schema:update --force
......@@ -27,7 +25,6 @@ update-dev:
install:
composer install --prefer-source
php bin/console fos:js-routing:dump --format=json --target=public/routes/fos_js_routes.json
php bin/console bazinga:js-translation:dump
npm install
npm run dev
php bin/console doctrine:database:create --if-not-exists
......
......@@ -7,40 +7,40 @@
"friendsofsymfony/jsrouting-bundle": "^2.0@dev",
"sensio/framework-extra-bundle": "^5.1",
"symfony/apache-pack": "dev-master",
"symfony/asset": "4.3.*",
"symfony/console": "4.3.*",
"symfony/dom-crawler": "4.3.*",
"symfony/expression-language": "4.3.*",
"symfony/filesystem": "4.3.*",
"symfony/asset": "4.4.*",
"symfony/console": "4.4.*",
"symfony/dom-crawler": "4.4.*",
"symfony/expression-language": "4.4.*",
"symfony/filesystem": "4.4.*",
"symfony/flex": "^1.1",
"symfony/form": "4.3.*",
"symfony/framework-bundle": "4.3.*",
"symfony/form": "4.4.*",
"symfony/framework-bundle": "4.4.*",
"symfony/monolog-bundle": "*",
"symfony/polyfill-apcu": "^1.9@dev",
"symfony/process": "4.3.*",
"symfony/security-bundle": "4.3.*",
"symfony/process": "4.4.*",
"symfony/security-bundle": "4.4.*",
"symfony/serializer-pack": "*",
"symfony/swiftmailer-bundle": "^3.2",
"symfony/translation": "4.3.*",
"symfony/twig-bundle": "4.3.*",
"symfony/validator": "4.3.*",
"symfony/web-link": "4.3.*",
"symfony/translation": "4.4.*",
"symfony/twig-bundle": "4.4.*",
"symfony/validator": "4.4.*",
"symfony/web-link": "4.4.*",
"symfony/webpack-encore-pack": "*",
"symfony/yaml": "4.3.*",
"symfony/yaml": "4.4.*",
"twig/extensions": "^1.5@dev",
"willdurand/js-translation-bundle": "^2.7@dev"
},
"require-dev": {
"doctrine/doctrine-fixtures-bundle": "^3.0",
"symfony/browser-kit": "4.3.*",
"symfony/css-selector": "4.3.*",
"symfony/browser-kit": "4.4.*",
"symfony/css-selector": "4.4.*",
"symfony/debug-pack": "*",
"symfony/dotenv": "4.3.*",
"symfony/dotenv": "4.4.*",
"symfony/maker-bundle": "^1.4",
"symfony/orm-pack": "*",
"symfony/phpunit-bridge": "4.3.*",
"symfony/phpunit-bridge": "4.4.*",
"symfony/profiler-pack": "*",
"symfony/web-server-bundle": "4.3.*"
"symfony/web-server-bundle": "4.4.*"
},
"config": {
"preferred-install": {
......@@ -81,7 +81,7 @@
},
"extra": {
"symfony": {
"require": "4.3.*",
"require": "4.4.*",
"allow-contrib": false
}
}
......
This diff is collapsed.
......@@ -5,7 +5,6 @@ return [
Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle::class => ['all' => true],
Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle::class => ['all' => true],
Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true],
Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
......
......@@ -3473,12 +3473,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
......@@ -3493,17 +3495,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
......@@ -3620,7 +3625,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
......@@ -3632,6 +3638,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
......@@ -3646,6 +3653,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
......@@ -3653,12 +3661,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
......@@ -3677,6 +3687,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
......@@ -3757,7 +3768,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
......@@ -3769,6 +3781,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
......@@ -3890,6 +3903,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
......
......@@ -18,33 +18,4 @@ class EditorialContentRepository extends ServiceEntityRepository
{
parent::__construct($registry, EditorialContent::class);
}
// /**
// * @return EditorialContent[] Returns an array of EditorialContent objects
// */
/*
public function findByExampleField($value)
{
return $this->createQueryBuilder('e')
->andWhere('e.exampleField = :val')
->setParameter('val', $value)
->orderBy('e.id', 'ASC')
->setMaxResults(10)
->getQuery()
->getResult()
;
}
*/
/*
public function findOneBySomeField($value): ?EditorialContent
{
return $this->createQueryBuilder('e')
->andWhere('e.exampleField = :val')
->setParameter('val', $value)
->getQuery()
->getOneOrNullResult()
;
}
*/
}
......@@ -8,7 +8,7 @@ use App\Entity\Project;
use App\Entity\User;
use App\Service\AppEnums;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Symfony\Bridge\Doctrine\RegistryInterface;
use Doctrine\Persistence\ManagerRegistry;
/**
* @method Media|null find($id, $lockMode = null, $lockVersion = null)
......@@ -18,7 +18,7 @@ use Symfony\Bridge\Doctrine\RegistryInterface;
*/
class MediaRepository extends ServiceEntityRepository
{
public function __construct(RegistryInterface $registry)
public function __construct(ManagerRegistry $registry)
{
parent::__construct($registry, Media::class);
}
......
......@@ -4,7 +4,7 @@ namespace App\Repository;
use App\Entity\Platform;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Symfony\Bridge\Doctrine\RegistryInterface;
use Doctrine\Persistence\ManagerRegistry;
/**
* @method Platform|null find($id, $lockMode = null, $lockVersion = null)
......@@ -14,7 +14,7 @@ use Symfony\Bridge\Doctrine\RegistryInterface;
*/
class PlatformRepository extends ServiceEntityRepository
{
public function __construct(RegistryInterface $registry)
public function __construct(ManagerRegistry $registry)
{
parent::__construct($registry, Platform::class);
}
......
......@@ -4,7 +4,7 @@ namespace App\Repository;
use App\Entity\Project;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Symfony\Bridge\Doctrine\RegistryInterface;
use Doctrine\Persistence\ManagerRegistry;
/**
* @method Project|null find($id, $lockMode = null, $lockVersion = null)
......@@ -14,37 +14,8 @@ use Symfony\Bridge\Doctrine\RegistryInterface;
*/
class ProjectRepository extends ServiceEntityRepository
{
public function __construct(RegistryInterface $registry)
public function __construct(ManagerRegistry $registry)
{
parent::__construct($registry, Project::class);
}
// /**
// * @return Media[] Returns an array of Media objects
// */
/*
public function findByExampleField($value)
{
return $this->createQueryBuilder('m')
->andWhere('m.exampleField = :val')
->setParameter('val', $value)
->orderBy('m.id', 'ASC')
->setMaxResults(10)
->getQuery()
->getResult()
;
}
*/
/*
public function findOneBySomeField($value): ?Media
{
return $this->createQueryBuilder('m')
->andWhere('m.exampleField = :val')
->setParameter('val', $value)
->getQuery()
->getOneOrNullResult()
;
}
*/
}
......@@ -8,7 +8,7 @@ use App\Entity\TranscriptionLog;
use App\Entity\User;
use App\Service\AppEnums;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Symfony\Bridge\Doctrine\RegistryInterface;
use Doctrine\Persistence\ManagerRegistry;
/**
* @method TranscriptionLog|null find($id, $lockMode = null, $lockVersion = null)
......@@ -18,7 +18,7 @@ use Symfony\Bridge\Doctrine\RegistryInterface;
*/
class TranscriptionLogRepository extends ServiceEntityRepository
{
public function __construct(RegistryInterface $registry)
public function __construct(ManagerRegistry $registry)
{
parent::__construct($registry, TranscriptionLog::class);
}
......
......@@ -6,7 +6,7 @@ use App\Entity\UserProjectStatus;
use App\Entity\Project;
use App\Service\AppEnums;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Symfony\Bridge\Doctrine\RegistryInterface;
use Doctrine\Persistence\ManagerRegistry;
/**
* @method Media|null find($id, $lockMode = null, $lockVersion = null)
......@@ -16,7 +16,7 @@ use Symfony\Bridge\Doctrine\RegistryInterface;
*/
class UserProjectStatusRepository extends ServiceEntityRepository
{
public function __construct(RegistryInterface $registry)
public function __construct(ManagerRegistry $registry)
{
parent::__construct($registry, UserProjectStatus::class);
}
......
......@@ -2,12 +2,12 @@
namespace App\Repository;
use App\Entity\User;
use App\Entity\Project;
use App\Entity\Transcription;
use App\Entity\User;
use App\Service\AppEnums;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Symfony\Bridge\Doctrine\RegistryInterface;
use Doctrine\Persistence\ManagerRegistry;
/**
* @method User|null find($id, $lockMode = null, $lockVersion = null)
......@@ -17,7 +17,7 @@ use Symfony\Bridge\Doctrine\RegistryInterface;
*/
class UserRepository extends ServiceEntityRepository
{
public function __construct(RegistryInterface $registry)
public function __construct(ManagerRegistry $registry)
{
parent::__construct($registry, User::class);
}
......
......@@ -98,7 +98,7 @@ class MessageManager
{
$messages = $this->getUnread();
$this->setAsRead($messages);
$this->fm->add('notice', 'mcreateessages_set_as_read_done');
$this->fm->add('notice', 'messages_set_as_read_done');
return;
}
......
......@@ -32,9 +32,6 @@
"ref": "c745b67e4dec2771d4d57a60efd224faf445c929"
}
},
"doctrine/doctrine-cache-bundle": {
"version": "1.3.3"
},
"doctrine/doctrine-fixtures-bundle": {
"version": "3.0",
"recipe": {
......@@ -89,9 +86,6 @@
"egulias/email-validator": {
"version": "2.1.3"
},
"fig/link-util": {
"version": "1.0.0"
},
"friendsofsymfony/jsrouting-bundle": {
"version": "2.0",
"recipe": {
......@@ -116,6 +110,9 @@
"ocramius/proxy-manager": {
"version": "2.1.1"
},
"php": {
"version": "7.2"
},
"phpdocumentor/reflection-common": {
"version": "1.0.1"
},
......@@ -212,6 +209,9 @@
"symfony/dotenv": {
"version": "v4.0.7"
},
"symfony/error-handler": {
"version": "v4.4.3"
},
"symfony/event-dispatcher": {
"version": "v4.0.7"
},
......
......@@ -5,7 +5,7 @@
<meta charset="UTF-8" />
<title>
{% block title %}
{{ platform.name }}
{{ platform.name }}
{% endblock %}
</title>
{% block stylesheets %}
......
......@@ -2,7 +2,7 @@
{% import "project/macros.html.twig" as macros %}
{% block body %}
{% include 'header.html.twig' with {'title' : "PLATEFORME DE TRANSCRIPTION ET D'ANNOTATION DE CORPUS TEXTUELS" } %}
{% include 'header.html.twig' with {'title' : "platform_title" } %}
<div id="main-container">
<div class="row px-5 py-3">
......
......@@ -168,6 +168,7 @@ platform_logo: Logo de la plateforme
platform_logs: Logs de la plateforme
platform_name: Nom de la plateforme
platform_page_title: Administration de la plateforme
platform_title: PLATEFORME DE TRANSCRIPTION ET D'ANNOTATION DE CORPUS TEXTUELS
please_wait: Veuillez patienter...
positive_review: Une relecture positive a été faite sur le média <a target="_blank" href="%url%">%media%</a> <br/> %comment%
preview_mode: Prévisualisation
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment