Commit d2ff5f23 authored by Stéphane Bouvry's avatar Stéphane Bouvry
Browse files

FIX : Mise à jour de la configuration Doctrine pour éviter les erreurs de...

FIX : Mise à jour de la configuration Doctrine pour éviter les erreurs de validation du schéma dans le test de configuration
parent 2d745707
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ class ConsoleController extends AbstractOscarController
            if (count($errors) > 0) {
                $this->consoleError("Obsolète");
                foreach( $errors as $error ){
                    $this->consoleError(" - " . $error);
                    $this->consoleError(" - " . $error . " - " . print_r($error));
                }
                $this->consoleError("EXECUTER : php vendor/bin/doctrine-module orm:schema-tool:update --force");
            } else {
+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ class Activity implements ResourceInterface
     * Discipline
     *
     * @var ArrayCollection
     * @ORM\ManyToMany(targetEntity="Discipline", cascade={"detach"})
     * @ORM\ManyToMany(targetEntity="Discipline", cascade={"detach"}, inversedBy="activities")
     */
    protected $disciplines;

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ class ActivityDate implements ITrackable

    /**
     * @var
     * @ORM\ManyToOne(targetEntity="DateType")
     * @ORM\ManyToOne(targetEntity="DateType", inversedBy="milestones")
     */
    private $type;

+11 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@

namespace Oscar\Entity;

use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Mapping as ORM;

/**
@@ -65,6 +66,16 @@ class DateType implements ITrackable
     */
    private $milestones;

    /**
     * DateType constructor.
     * @param \Doctrine\Common\Collections\Collection $milestones
     */
    public function __construct()
    {
        $this->milestones = new ArrayCollection();
    }


    /**
     * @return bool
     */
+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ class Discipline

    /**
     * @var \Doctrine\Common\Collections\Collection
     * @ORM\OneToMany(targetEntity="Activity", mappedBy="disciplines")
     * @ORM\ManyToMany(targetEntity="Activity", mappedBy="disciplines")
     */
    private $activities;