Update composer, fix class traits

pull/3124/head
Julio Montoya 6 years ago
parent 0f3efc0fca
commit 4b9eb335a4
  1. 36
      composer.json
  2. 4
      src/ContactBundle/Entity/Category.php
  3. 4
      src/ContactBundle/Entity/CategoryTranslation.php
  4. 4
      src/FaqBundle/Entity/Category.php
  5. 4
      src/FaqBundle/Entity/CategoryTranslation.php
  6. 4
      src/FaqBundle/Entity/Question.php
  7. 4
      src/FaqBundle/Entity/QuestionTranslation.php

@ -82,8 +82,8 @@
"jeroendesloovere/vcard": "~1.7",
"jimmiw/php-time-ago": "~3.0",
"kigkonsult/icalcreator": "~2.24",
"knplabs/doctrine-behaviors": "~1.6",
"knplabs/gaufrette": "~0.7",
"knplabs/doctrine-behaviors": "~2.0",
"knplabs/gaufrette": "~0.9",
"knplabs/knp-components": "~2.0",
"knplabs/knp-menu-bundle": "^2.0",
"knpuniversity/oauth2-client-bundle": "^1.31",
@ -96,11 +96,11 @@
"league/csv": "^9.1",
"league/glide-symfony": "^1.0",
"liip/imagine-bundle": "^2.1",
"liip/theme-bundle": "^1.6",
"liip/theme-bundle": "^1.7",
"maennchen/zipstream-php": "^1.2",
"masterminds/html5": "2.*",
"masterminds/html5": "^2.0",
"michelf/php-markdown": "~1.8",
"mopa/bootstrap-bundle": "~3.2",
"mopa/bootstrap-bundle": "~3.3",
"mpdf/mpdf": "~8.0",
"oneup/flysystem-bundle": "~3.0",
"oneup/uploader-bundle": "dev-master",
@ -137,27 +137,27 @@
"stephpy/timeline-bundle": "~3.0",
"sunra/php-simple-html-dom-parser": "~1.5.0",
"symfony/apache-pack": "^1.0",
"symfony/asset": "^4.0",
"symfony/asset": "^4.0|^5.0",
"symfony/dotenv": "^4.0|^5.0",
"symfony/expression-language": "^4.0",
"symfony/expression-language": "^4.0|^5.0",
"symfony/flex": "^1.6",
"symfony/form": "^4.0",
"symfony/framework-bundle": "^4.0",
"symfony/http-kernel": "^4.0",
"symfony/framework-bundle": "^4.0|^5.0",
"symfony/http-kernel": "^4.0|^5.0",
"symfony/mailer": "^4.0|^5.0",
"symfony/monolog-bundle": "^3.1",
"symfony/polyfill-apcu": "^1.9",
"symfony/requirements-checker": "^1.1",
"symfony/security-bundle": "^4.0|^5.0",
"symfony/templating" : "^4.0",
"symfony/translation": "^4.0",
"symfony/templating" : "^4.0|^5.0",
"symfony/translation": "^4.0|^5.0",
"symfony/twig-bundle": "^4.0|^5.0",
"symfony/validator": "^4.0",
"symfony/validator": "^4.0|^5.0",
"symfony/webpack-encore-bundle": "^1.7",
"symfony/yaml": "^4.0|^5.0",
"tgalopin/html-sanitizer-bundle": "^1.1",
"twig/extensions": "^1.5",
"vich/uploader-bundle": "~1.0",
"vich/uploader-bundle": "dev-master",
"webit/eval-math": "~1.0"
},
"config": {
@ -169,15 +169,15 @@
"behat/mink-extension": "@stable",
"behat/mink-goutte-driver": "@stable",
"behat/mink-selenium2-driver": "@stable",
"php-translation/symfony-bundle": "^0.10",
"php-translation/symfony-bundle": "^0.11",
"phpstan/phpstan": "^0.12.3",
"symfony/browser-kit": "^4.0",
"symfony/css-selector": "^4.0",
"symfony/browser-kit": "^4.0|^5.0",
"symfony/css-selector": "^4.0|^5.0",
"symfony/debug-pack": "*",
"symfony/phpunit-bridge": "^4.0",
"symfony/phpunit-bridge": "^4.0|^5.0",
"symfony/profiler-pack": "*",
"symfony/test-pack": "*",
"symplify/easy-coding-standard": "^7.1",
"symplify/easy-coding-standard": "^7.0",
"vimeo/psalm": "^3.7"
},
"scripts": {

@ -5,7 +5,7 @@
namespace Chamilo\ContactBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
use Knp\DoctrineBehaviors\Model as ORMBehaviors;
use Knp\DoctrineBehaviors\Model\Translatable\TranslationTrait;
/**
* Class Category.
@ -15,7 +15,7 @@ use Knp\DoctrineBehaviors\Model as ORMBehaviors;
*/
class Category
{
use ORMBehaviors\Translatable\Translatable;
use TranslationTrait;
/**
* @var int

@ -5,7 +5,7 @@
namespace Chamilo\ContactBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
use Knp\DoctrineBehaviors\Model as ORMBehaviors;
use Knp\DoctrineBehaviors\Model\Translatable\TranslationTrait;
/**
* Class CategoryTranslation.
@ -18,7 +18,7 @@ use Knp\DoctrineBehaviors\Model as ORMBehaviors;
*/
class CategoryTranslation
{
use ORMBehaviors\Translatable\Translation;
use TranslationTrait;
/**
* @ORM\Column(type="string", length=255, nullable=false)

@ -7,7 +7,7 @@ namespace Chamilo\FaqBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
use Gedmo\Mapping\Annotation as Gedmo;
use Gedmo\Timestampable\Traits\TimestampableEntity;
use Knp\DoctrineBehaviors\Model as ORMBehaviors;
use Knp\DoctrineBehaviors\Model\Translatable\TranslationTrait;
/**
* Class Category.
@ -20,8 +20,8 @@ use Knp\DoctrineBehaviors\Model as ORMBehaviors;
*/
class Category
{
use ORMBehaviors\Translatable\Translatable;
use TimestampableEntity;
use TranslationTrait;
/**
* @ORM\Column(type="integer")

@ -6,7 +6,7 @@ namespace Chamilo\FaqBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
use Gedmo\Mapping\Annotation as Gedmo;
use Knp\DoctrineBehaviors\Model as ORMBehaviors;
use Knp\DoctrineBehaviors\Model\Translatable\TranslationTrait;
/**
* Class CategoryTranslation.
@ -28,7 +28,7 @@ use Knp\DoctrineBehaviors\Model as ORMBehaviors;
*/
class CategoryTranslation
{
use ORMBehaviors\Translatable\Translation;
use TranslationTrait;
/**
* @ORM\Column(type="string", length=255, nullable=false)

@ -7,7 +7,7 @@ namespace Chamilo\FaqBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
use Gedmo\Mapping\Annotation as Gedmo;
use Gedmo\Timestampable\Traits\TimestampableEntity;
use Knp\DoctrineBehaviors\Model as ORMBehaviors;
use Knp\DoctrineBehaviors\Model\Translatable\TranslationTrait;
/**
* Class Question.
@ -17,7 +17,7 @@ use Knp\DoctrineBehaviors\Model as ORMBehaviors;
*/
class Question
{
use ORMBehaviors\Translatable\Translatable;
use TranslationTrait;
use TimestampableEntity;
/**

@ -6,7 +6,7 @@ namespace Chamilo\FaqBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
use Gedmo\Mapping\Annotation as Gedmo;
use Knp\DoctrineBehaviors\Model as ORMBehaviors;
use Knp\DoctrineBehaviors\Model\Translatable\TranslationTrait;
/**
* Class CategoryTranslation.
@ -29,7 +29,7 @@ use Knp\DoctrineBehaviors\Model as ORMBehaviors;
*/
class QuestionTranslation
{
use ORMBehaviors\Translatable\Translation;
use TranslationTrait;
/**
* @ORM\Column(type="string", length=255, nullable=false)

Loading…
Cancel
Save