diff --git a/src/Entity/Parts/Storelocation.php b/src/Entity/Parts/Storelocation.php index 916a154c..af930a0a 100644 --- a/src/Entity/Parts/Storelocation.php +++ b/src/Entity/Parts/Storelocation.php @@ -107,11 +107,11 @@ class Storelocation extends PartsContainingDBElement protected $storage_type; /** - * //@ORM\ManyToMany(targetEntity="Part", fetch="EXTRA_LAZY") - * //@ORM\JoinTable(name="part_lots", - * // joinColumns={@ORM\JoinColumn(name="id_store_location", referencedColumnName="id")}, - * // inverseJoinColumns={@ORM\JoinColumn(name="id_part", referencedColumnName="id")} - * //) + * @ORM\ManyToMany(targetEntity="Part", fetch="EXTRA_LAZY") + * @ORM\JoinTable(name="part_lots", + * joinColumns={@ORM\JoinColumn(name="id_store_location", referencedColumnName="id")}, + * inverseJoinColumns={@ORM\JoinColumn(name="id_part", referencedColumnName="id")} + * ) */ protected $parts; diff --git a/src/Entity/Parts/Supplier.php b/src/Entity/Parts/Supplier.php index ad41d7a2..707d217b 100644 --- a/src/Entity/Parts/Supplier.php +++ b/src/Entity/Parts/Supplier.php @@ -106,11 +106,11 @@ class Supplier extends Company protected $shipping_costs; /** - * //@ORM\ManyToMany(targetEntity="Part", fetch="EXTRA_LAZY") - * //@ORM\JoinTable(name="orderdetails", - * // joinColumns={@ORM\JoinColumn(name="id_supplier", referencedColumnName="id")}, - * // inverseJoinColumns={@ORM\JoinColumn(name="part_id", referencedColumnName="id")} - * //) + * @ORM\ManyToMany(targetEntity="Part", fetch="EXTRA_LAZY") + * @ORM\JoinTable(name="orderdetails", + * joinColumns={@ORM\JoinColumn(name="id_supplier", referencedColumnName="id")}, + * inverseJoinColumns={@ORM\JoinColumn(name="part_id", referencedColumnName="id")} + * ) */ protected $parts; diff --git a/tests/Controller/RedirectControllerTest.php b/tests/Controller/RedirectControllerTest.php index 098ee1fb..48c1283b 100644 --- a/tests/Controller/RedirectControllerTest.php +++ b/tests/Controller/RedirectControllerTest.php @@ -142,6 +142,6 @@ class RedirectControllerTest extends WebTestCase $this->client->followRedirects(false); $this->client->request('GET', '/part/3'); - $this->assertEquals("/$locale/user/settings", $this->client->getResponse()->headers->get('Location')); + $this->assertEquals('http://localhost' . "/$locale/user/settings", $this->client->getResponse()->headers->get('Location')); } }