From 0cde35be41f9de80fdab90b474ce46378a2faebd Mon Sep 17 00:00:00 2001 From: Robbe Serry Date: Sat, 14 Oct 2023 11:07:17 +0000 Subject: [PATCH] fix to much renaming --- .../Controller/Admin/Match/ProfileController.php | 2 +- module/BrBundle/Entity/Connection.php | 6 +++--- module/BrBundle/Entity/Match/Feature.php | 10 +++++----- module/BrBundle/Entity/Match/MatcheeMap.php | 10 +++++----- .../Entity/Match/MatcheeMap/CompanyMatcheeMap.php | 2 +- .../Entity/Match/MatcheeMap/StudentMatcheeMap.php | 2 +- module/BrBundle/Entity/Match/Profile.php | 8 ++++---- .../BrBundle/Entity/Match/Profile/CompanyProfile.php | 2 +- .../Entity/Match/Profile/ProfileCompanyMap.php | 4 ++-- .../Entity/Match/Profile/ProfileFeatureMap.php | 6 +++--- .../Entity/Match/Profile/ProfileStudentMap.php | 4 ++-- .../BrBundle/Entity/Match/Profile/StudentProfile.php | 2 +- module/BrBundle/Entity/Match/Wave.php | 4 ++-- module/BrBundle/Entity/Match/Wave/CompanyWave.php | 6 +++--- module/BrBundle/Entity/Match/Wave/WaveMatchMap.php | 4 ++-- module/BrBundle/Form/Admin/Match/Profile/Add.php | 2 +- module/BrBundle/Repository/Match/Feature.php | 2 +- module/BrBundle/Resources/layouts/corporate/base.twig | 2 +- 18 files changed, 39 insertions(+), 39 deletions(-) diff --git a/module/BrBundle/Controller/Admin/Match/ProfileController.php b/module/BrBundle/Controller/Admin/Match/ProfileController.php index 9c0565952d..50bcf1baac 100644 --- a/module/BrBundle/Controller/Admin/Match/ProfileController.php +++ b/module/BrBundle/Controller/Admin/Match/ProfileController.php @@ -145,7 +145,7 @@ public function addAction() // $id = substr($key, strlen('feature_')); // $map = new ProfileFeatureMap( // $this->getEntityManager() -// ->getRepository('BrBundle\Entity\Connection\Feature') +// ->getRepository('BrBundle\Entity\Match\Feature') // ->findOneById($id),$profile, $val); // $this->getEntityManager()->persist($map); // $profile->addFeature($map); diff --git a/module/BrBundle/Entity/Connection.php b/module/BrBundle/Entity/Connection.php index 0d2b55214b..6111fd828f 100644 --- a/module/BrBundle/Entity/Connection.php +++ b/module/BrBundle/Entity/Connection.php @@ -31,7 +31,7 @@ class Connection /** * @var CompanyMatcheeMap The company-matchee's profiles * - * @ORM\OneToOne(targetEntity="\BrBundle\Entity\Connection\MatcheeMap\CompanyMatcheeMap") + * @ORM\OneToOne(targetEntity="\BrBundle\Entity\Match\MatcheeMap\CompanyMatcheeMap") * @ORM\JoinColumn(name="company", referencedColumnName="id", onDelete="CASCADE") */ private $companyMatchee; @@ -39,7 +39,7 @@ class Connection /** * @var StudentMatcheeMap The student-matchee's profiles * - * @ORM\OneToOne(targetEntity="\BrBundle\Entity\Connection\MatcheeMap\StudentMatcheeMap") + * @ORM\OneToOne(targetEntity="\BrBundle\Entity\Match\MatcheeMap\StudentMatcheeMap") * @ORM\JoinColumn(name="student", referencedColumnName="id", onDelete="CASCADE") */ private $studentMatchee; @@ -54,7 +54,7 @@ class Connection /** * @var Wave\WaveMatchMap The match's wave * - * @ORM\ManyToOne(targetEntity="BrBundle\Entity\Connection\Wave\WaveMatchMap") + * @ORM\ManyToOne(targetEntity="BrBundle\Entity\Match\Wave\WaveMatchMap") * @ORM\JoinColumn(name="wave", referencedColumnName="id", nullable=true, onDelete="set null") */ private $wave; diff --git a/module/BrBundle/Entity/Match/Feature.php b/module/BrBundle/Entity/Match/Feature.php index 7b21090199..42525ef403 100644 --- a/module/BrBundle/Entity/Match/Feature.php +++ b/module/BrBundle/Entity/Match/Feature.php @@ -8,7 +8,7 @@ /** * This is a profile for a student or company. * - * @ORM\Entity(repositoryClass="BrBundle\Repository\Connection\Feature") + * @ORM\Entity(repositoryClass="BrBundle\Repository\Match\Feature") * @ORM\Table(name="br_match_feature") */ class Feature @@ -32,7 +32,7 @@ class Feature /** * @var ArrayCollection The bonusses of this feature * - * @ORM\ManyToMany(targetEntity="BrBundle\Entity\Connection\Feature", inversedBy="theirBonus", indexBy="id") + * @ORM\ManyToMany(targetEntity="BrBundle\Entity\Match\Feature", inversedBy="theirBonus", indexBy="id") * @ORM\JoinTable( * name="br_match_feature_bonus_map", * joinColumns={@ORM\JoinColumn(name="bonus1", referencedColumnName="id")}, @@ -43,14 +43,14 @@ class Feature /** * The features that have this as bonus. - * @ORM\ManyToMany(targetEntity="BrBundle\Entity\Connection\Feature", mappedBy="myBonus") + * @ORM\ManyToMany(targetEntity="BrBundle\Entity\Match\Feature", mappedBy="myBonus") */ private $theirBonus; /** * @var ArrayCollection The malusses of this feature * - * @ORM\ManyToMany(targetEntity="BrBundle\Entity\Connection\Feature", inversedBy="theirMalus", indexBy="id") + * @ORM\ManyToMany(targetEntity="BrBundle\Entity\Match\Feature", inversedBy="theirMalus", indexBy="id") * @ORM\JoinTable( * name="br_match_feature_malus_map", * joinColumns={@ORM\JoinColumn(name="malus1", referencedColumnName="id")}, @@ -61,7 +61,7 @@ class Feature /** * The features that have this as malus. - * @ORM\ManyToMany(targetEntity="BrBundle\Entity\Connection\Feature", mappedBy="myMalus") + * @ORM\ManyToMany(targetEntity="BrBundle\Entity\Match\Feature", mappedBy="myMalus") */ private $theirMalus; diff --git a/module/BrBundle/Entity/Match/MatcheeMap.php b/module/BrBundle/Entity/Match/MatcheeMap.php index 09d039b5fe..c1eb09795b 100644 --- a/module/BrBundle/Entity/Match/MatcheeMap.php +++ b/module/BrBundle/Entity/Match/MatcheeMap.php @@ -24,13 +24,13 @@ use Doctrine\ORM\Mapping as ORM; /** - * @ORM\Entity(repositoryClass="BrBundle\Repository\Connection\MatcheeMap") + * @ORM\Entity(repositoryClass="BrBundle\Repository\Match\MatcheeMap") * @ORM\Table(name="br_match_matchee_map") * @ORM\InheritanceType("JOINED") * @ORM\DiscriminatorColumn(name="inheritance_type", type="string") * @ORM\DiscriminatorMap({ - * "student_matchee_map"="BrBundle\Entity\Connection\MatcheeMap\StudentMatcheeMap", - * "company_matchee_map"="BrBundle\Entity\Connection\MatcheeMap\CompanyMatcheeMap" + * "student_matchee_map"="BrBundle\Entity\Match\MatcheeMap\StudentMatcheeMap", + * "company_matchee_map"="BrBundle\Entity\Match\MatcheeMap\CompanyMatcheeMap" * }) */ abstract class MatcheeMap @@ -47,7 +47,7 @@ abstract class MatcheeMap /** *@var Profile The company-profile of this matchee * - * @ORM\ManyToOne(targetEntity="BrBundle\Entity\Connection\Profile") + * @ORM\ManyToOne(targetEntity="BrBundle\Entity\Match\Profile") * @ORM\JoinColumn(referencedColumnName="id", onDelete="CASCADE") */ private $companyProfile; @@ -55,7 +55,7 @@ abstract class MatcheeMap /** *@var Profile The student-profile of this matchee * - * @ORM\ManyToOne(targetEntity="BrBundle\Entity\Connection\Profile") + * @ORM\ManyToOne(targetEntity="BrBundle\Entity\Match\Profile") * @ORM\JoinColumn(referencedColumnName="id", onDelete="CASCADE") */ private $studentProfile; diff --git a/module/BrBundle/Entity/Match/MatcheeMap/CompanyMatcheeMap.php b/module/BrBundle/Entity/Match/MatcheeMap/CompanyMatcheeMap.php index eaf5d9a240..ba0bcfeab8 100644 --- a/module/BrBundle/Entity/Match/MatcheeMap/CompanyMatcheeMap.php +++ b/module/BrBundle/Entity/Match/MatcheeMap/CompanyMatcheeMap.php @@ -30,7 +30,7 @@ * This is a profile for a company. The company will use this to save company traits, * the student will use this to indicate which traits they desire in future employers. * - * @ORM\Entity(repositoryClass="BrBundle\Repository\Connection\MatcheeMap\CompanyMatcheeMap") + * @ORM\Entity(repositoryClass="BrBundle\Repository\Match\MatcheeMap\CompanyMatcheeMap") * @ORM\Table(name="br_match_matchee_map_company") */ class CompanyMatcheeMap extends MatcheeMap diff --git a/module/BrBundle/Entity/Match/MatcheeMap/StudentMatcheeMap.php b/module/BrBundle/Entity/Match/MatcheeMap/StudentMatcheeMap.php index 299336d69a..5ce5923bd3 100644 --- a/module/BrBundle/Entity/Match/MatcheeMap/StudentMatcheeMap.php +++ b/module/BrBundle/Entity/Match/MatcheeMap/StudentMatcheeMap.php @@ -30,7 +30,7 @@ * This is a profile for a company. The company will use this to save company traits, * the student will use this to indicate which traits they desire in future employers. * - * @ORM\Entity(repositoryClass="BrBundle\Repository\Connection\MatcheeMap\StudentMatcheeMap") + * @ORM\Entity(repositoryClass="BrBundle\Repository\Match\MatcheeMap\StudentMatcheeMap") * @ORM\Table(name="br_match_matchee_map_student") */ class StudentMatcheeMap extends MatcheeMap diff --git a/module/BrBundle/Entity/Match/Profile.php b/module/BrBundle/Entity/Match/Profile.php index 51d9e5fb5f..e6f05d6a51 100644 --- a/module/BrBundle/Entity/Match/Profile.php +++ b/module/BrBundle/Entity/Match/Profile.php @@ -10,13 +10,13 @@ /** * This is a profile for a student or company. * - * @ORM\Entity(repositoryClass="BrBundle\Repository\Connection\Profile") + * @ORM\Entity(repositoryClass="BrBundle\Repository\Match\Profile") * @ORM\Table(name="br_match_profile") * @ORM\InheritanceType("JOINED") * @ORM\DiscriminatorColumn(name="inheritance_type", type="string") * @ORM\DiscriminatorMap({ - * "company_profile"="BrBundle\Entity\Connection\Profile\CompanyProfile", - * "student_profile"="BrBundle\Entity\Connection\Profile\StudentProfile" + * "company_profile"="BrBundle\Entity\Match\Profile\CompanyProfile", + * "student_profile"="BrBundle\Entity\Match\Profile\StudentProfile" * }) */ abstract class Profile @@ -33,7 +33,7 @@ abstract class Profile /** * @var ArrayCollection The members of this group * - * @ORM\OneToMany(targetEntity="BrBundle\Entity\Connection\Profile\ProfileFeatureMap", mappedBy="profile") + * @ORM\OneToMany(targetEntity="BrBundle\Entity\Match\Profile\ProfileFeatureMap", mappedBy="profile") */ private $features; diff --git a/module/BrBundle/Entity/Match/Profile/CompanyProfile.php b/module/BrBundle/Entity/Match/Profile/CompanyProfile.php index 237a1370ec..399e41c6a4 100644 --- a/module/BrBundle/Entity/Match/Profile/CompanyProfile.php +++ b/module/BrBundle/Entity/Match/Profile/CompanyProfile.php @@ -27,7 +27,7 @@ * This is a profile for a company. The company will use this to save company traits, * the student will use this to indicate which traits they desire in future employers. * - * @ORM\Entity(repositoryClass="BrBundle\Repository\Connection\Profile\CompanyProfile") + * @ORM\Entity(repositoryClass="BrBundle\Repository\Match\Profile\CompanyProfile") * @ORM\Table(name="br_match_profile_companyprofile") */ class CompanyProfile extends Profile diff --git a/module/BrBundle/Entity/Match/Profile/ProfileCompanyMap.php b/module/BrBundle/Entity/Match/Profile/ProfileCompanyMap.php index 4d79f8ce3a..01d219bbf1 100644 --- a/module/BrBundle/Entity/Match/Profile/ProfileCompanyMap.php +++ b/module/BrBundle/Entity/Match/Profile/ProfileCompanyMap.php @@ -28,7 +28,7 @@ * This is a profile for a company. The company will use this to save company traits, * the student will use this to indicate which traits they desire in future employers. * - * @ORM\Entity(repositoryClass="BrBundle\Repository\Connection\Profile\ProfileCompanyMap") + * @ORM\Entity(repositoryClass="BrBundle\Repository\Match\Profile\ProfileCompanyMap") * @ORM\Table(name="br_match_profile_company_map") */ class ProfileCompanyMap @@ -53,7 +53,7 @@ class ProfileCompanyMap /** * @var Profile The profile * - * @ORM\ManyToOne(targetEntity="\BrBundle\Entity\Connection\Profile") + * @ORM\ManyToOne(targetEntity="\BrBundle\Entity\Match\Profile") * @ORM\JoinColumn(name="profile", referencedColumnName="id", unique=false, onDelete="CASCADE") */ private $profile; diff --git a/module/BrBundle/Entity/Match/Profile/ProfileFeatureMap.php b/module/BrBundle/Entity/Match/Profile/ProfileFeatureMap.php index aff88df982..33794e1079 100644 --- a/module/BrBundle/Entity/Match/Profile/ProfileFeatureMap.php +++ b/module/BrBundle/Entity/Match/Profile/ProfileFeatureMap.php @@ -27,7 +27,7 @@ /** * This is a map between a feature and a profile. * - * @ORM\Entity(repositoryClass="BrBundle\Repository\Connection\Profile\ProfileFeatureMap") + * @ORM\Entity(repositoryClass="BrBundle\Repository\Match\Profile\ProfileFeatureMap") * @ORM\Table( * name="br_match_profile_feature_map", * uniqueConstraints={@ORM\UniqueConstraint(name="profile_feature_map_feature_profile", columns={"feature", "profile"})} @@ -47,7 +47,7 @@ class ProfileFeatureMap /** * @var Feature * - * @ORM\ManyToOne(targetEntity="\BrBundle\Entity\Connection\Feature") + * @ORM\ManyToOne(targetEntity="\BrBundle\Entity\Match\Feature") * @ORM\JoinColumn(name="feature", referencedColumnName="id", onDelete="CASCADE") */ private $feature; @@ -55,7 +55,7 @@ class ProfileFeatureMap /** * @var Profile * - * @ORM\ManyToOne(targetEntity="\BrBundle\Entity\Connection\Profile") + * @ORM\ManyToOne(targetEntity="\BrBundle\Entity\Match\Profile") * @ORM\JoinColumn(name="profile", referencedColumnName="id", onDelete="CASCADE") */ private $profile; diff --git a/module/BrBundle/Entity/Match/Profile/ProfileStudentMap.php b/module/BrBundle/Entity/Match/Profile/ProfileStudentMap.php index 80c1b09dbe..d2182cc589 100644 --- a/module/BrBundle/Entity/Match/Profile/ProfileStudentMap.php +++ b/module/BrBundle/Entity/Match/Profile/ProfileStudentMap.php @@ -28,7 +28,7 @@ * This is a profile for a student. The student will use this to save student traits, * the company will use this to indicate which traits they desire in future employees. * - * @ORM\Entity(repositoryClass="BrBundle\Repository\Connection\Profile\ProfileStudentMap") + * @ORM\Entity(repositoryClass="BrBundle\Repository\Match\Profile\ProfileStudentMap") * @ORM\Table(name="br_match_profile_student_map") */ class ProfileStudentMap @@ -53,7 +53,7 @@ class ProfileStudentMap /** * @var Profile The profile * - * @ORM\ManyToOne(targetEntity="\BrBundle\Entity\Connection\Profile") + * @ORM\ManyToOne(targetEntity="\BrBundle\Entity\Match\Profile") * @ORM\JoinColumn(name="profile", referencedColumnName="id", unique=false, onDelete="CASCADE") */ private $profile; diff --git a/module/BrBundle/Entity/Match/Profile/StudentProfile.php b/module/BrBundle/Entity/Match/Profile/StudentProfile.php index 71e8a4c3d2..07a63c6d77 100644 --- a/module/BrBundle/Entity/Match/Profile/StudentProfile.php +++ b/module/BrBundle/Entity/Match/Profile/StudentProfile.php @@ -27,7 +27,7 @@ * This is a profile for a student. The student will use this to save personal traits, * the company will use this to indicate which traits they desire in future employees. * - * @ORM\Entity(repositoryClass="BrBundle\Repository\Connection\Profile\StudentProfile") + * @ORM\Entity(repositoryClass="BrBundle\Repository\Match\Profile\StudentProfile") * @ORM\Table(name="br_match_profile_studentprofile") */ class StudentProfile extends Profile diff --git a/module/BrBundle/Entity/Match/Wave.php b/module/BrBundle/Entity/Match/Wave.php index ec36f65e2d..2e73d922d6 100644 --- a/module/BrBundle/Entity/Match/Wave.php +++ b/module/BrBundle/Entity/Match/Wave.php @@ -27,7 +27,7 @@ /** * This is a wave consisting of many companyWaves. * - * @ORM\Entity(repositoryClass="BrBundle\Repository\Connection\Wave") + * @ORM\Entity(repositoryClass="BrBundle\Repository\Match\Wave") * @ORM\Table(name="br_match_wave") */ class Wave @@ -51,7 +51,7 @@ class Wave /** * @var ArrayCollection The company waves * - * @ORM\OneToMany(targetEntity="\BrBundle\Entity\Connection\Wave\CompanyWave", mappedBy="wave") + * @ORM\OneToMany(targetEntity="\BrBundle\Entity\Match\Wave\CompanyWave", mappedBy="wave") * @ORM\JoinColumn(name="company_waves", referencedColumnName="id") */ private $companyWaves; diff --git a/module/BrBundle/Entity/Match/Wave/CompanyWave.php b/module/BrBundle/Entity/Match/Wave/CompanyWave.php index 184aa6d210..ec31f8d132 100644 --- a/module/BrBundle/Entity/Match/Wave/CompanyWave.php +++ b/module/BrBundle/Entity/Match/Wave/CompanyWave.php @@ -28,7 +28,7 @@ /** * This is a wave for a company. * - * @ORM\Entity(repositoryClass="BrBundle\Repository\Connection\Wave\CompanyWave") + * @ORM\Entity(repositoryClass="BrBundle\Repository\Match\Wave\CompanyWave") * @ORM\Table(name="br_match_companywave") */ class CompanyWave @@ -53,7 +53,7 @@ class CompanyWave /** * @var ArrayCollection The company's top matches in this wave * - * @ORM\OneToMany(targetEntity="\BrBundle\Entity\Connection\Wave\WaveMatchMap", mappedBy="companywave") + * @ORM\OneToMany(targetEntity="\BrBundle\Entity\Match\Wave\WaveMatchMap", mappedBy="companywave") * @ORM\JoinColumn(name="matches", referencedColumnName="id") */ private $matches; @@ -61,7 +61,7 @@ class CompanyWave /** * @var Wave The wave * - * @ORM\ManyToOne(targetEntity="BrBundle\Entity\Connection\Wave") + * @ORM\ManyToOne(targetEntity="BrBundle\Entity\Match\Wave") * @ORM\JoinColumn(name="wave", referencedColumnName="id", onDelete="cascade") */ private $wave; diff --git a/module/BrBundle/Entity/Match/Wave/WaveMatchMap.php b/module/BrBundle/Entity/Match/Wave/WaveMatchMap.php index 919128848f..f4f34b1c7d 100644 --- a/module/BrBundle/Entity/Match/Wave/WaveMatchMap.php +++ b/module/BrBundle/Entity/Match/Wave/WaveMatchMap.php @@ -24,7 +24,7 @@ use Doctrine\ORM\Mapping as ORM; /** - * @ORM\Entity(repositoryClass="BrBundle\Repository\Connection\Wave\WaveMatcheeMap") + * @ORM\Entity(repositoryClass="BrBundle\Repository\Match\Wave\WaveMatcheeMap") * @ORM\Table(name="br_match_companywave_match_map") */ class WaveMatchMap @@ -41,7 +41,7 @@ class WaveMatchMap /** *@var CompanyWave The company wave * - * @ORM\ManyToOne(targetEntity="BrBundle\Entity\Connection\Wave\CompanyWave") + * @ORM\ManyToOne(targetEntity="BrBundle\Entity\Match\Wave\CompanyWave") * @ORM\JoinColumn(referencedColumnName="id", onDelete="cascade") */ private $companywave; diff --git a/module/BrBundle/Form/Admin/Match/Profile/Add.php b/module/BrBundle/Form/Admin/Match/Profile/Add.php index 82a73596c4..8570535d12 100644 --- a/module/BrBundle/Form/Admin/Match/Profile/Add.php +++ b/module/BrBundle/Form/Admin/Match/Profile/Add.php @@ -136,7 +136,7 @@ public function init() // private function getFeatureNames() // { // $featureNames = array(); -// foreach ($this->getEntityManager()->getRepository('BrBundle\Entity\Connection\Feature')->findAll() as $feature) { +// foreach ($this->getEntityManager()->getRepository('BrBundle\Entity\Match\Feature')->findAll() as $feature) { // if ($feature->getType() == 'company' || is_null($feature->getType())) // $featureNames[$feature->getId()] = $feature->getName(); // } diff --git a/module/BrBundle/Repository/Match/Feature.php b/module/BrBundle/Repository/Match/Feature.php index 7a2e89e3f6..b524875801 100644 --- a/module/BrBundle/Repository/Match/Feature.php +++ b/module/BrBundle/Repository/Match/Feature.php @@ -37,7 +37,7 @@ class Feature extends \CommonBundle\Component\Doctrine\ORM\EntityRepository // { // $query = $this->getEntityManager()->createQueryBuilder(); // $bonus2 = $query->select('b.id') -// ->from('BrBundle\Entity\Connection\Feature', 'f') +// ->from('BrBundle\Entity\Match\Feature', 'f') // ->innerJoin('f.bonus2', 'b') // ->where( // $query->expr()->eq('m.bonus2', ':feature') diff --git a/module/BrBundle/Resources/layouts/corporate/base.twig b/module/BrBundle/Resources/layouts/corporate/base.twig index 630f4e939e..f4ffa9738f 100644 --- a/module/BrBundle/Resources/layouts/corporate/base.twig +++ b/module/BrBundle/Resources/layouts/corporate/base.twig @@ -126,7 +126,7 @@ {% if hasAccess('br_corporate_match', 'overview') %}
- {{ translate('Connection') }} + {{ translate('Match') }}
{% endif %}