fix to much renaming

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);

module/BrBundle/Entity/Connection.php

@@ -31,15 +31,15 @@ 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;
 
     /**
      * @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;

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;
 

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,15 +47,15 @@ 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;
 
     /**
      *@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;

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

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

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;
 

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

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;

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,15 +47,15 @@ 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;
 
     /**
      * @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;

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;

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

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;

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,15 +53,15 @@ 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;
 
     /**
      * @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;

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;

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();
 //        }

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')

module/BrBundle/Resources/layouts/corporate/base.twig

@@ -126,7 +126,7 @@
                         {% if hasAccess('br_corporate_match', 'overview') %}
                             <div class="vtk-menuitem-holder br">
                                 <a {% if 'overview' == getParam('action') and 'br_corporate_match' == getParam('controller') %} class="br-menuUnderlineStyle active" {% else %} class="br-menuUnderlineStyle" {% endif %} href="{{ url("br_corporate_match", {"action": "overview", "language": language.getAbbrev()}) }}">
-                                    {{ translate('Connection') }}
+                                    {{ translate('Match') }}
                                 </a>
                             </div>
                         {% endif %}