Move entities into unified namespace

site/app/config/config_dev.yml

@@ -55,11 +55,11 @@ assetic:
 easy_admin:
     site_name: 'LibreCores Admin'
     entities:
-        - Librecores\ProjectRepoBundle\Entity\GitSourceRepo
-        - Librecores\ProjectRepoBundle\Entity\Organization
-        - Librecores\ProjectRepoBundle\Entity\OrganizationMember
-        - Librecores\ProjectRepoBundle\Entity\Project
-#        - Librecores\ProjectRepoBundle\Entity\SourceStats
-#        - Librecores\ProjectRepoBundle\Entity\SourceStatsAuthor
-#        - Librecores\ProjectRepoBundle\Entity\SourceStatsCommitHistogram
-        - Librecores\ProjectRepoBundle\Entity\User
+        - App\Entity\GitSourceRepo
+        - App\Entity\Organization
+        - App\Entity\OrganizationMember
+        - App\Entity\Project
+#        - App\Entity\SourceStats
+#        - App\Entity\SourceStatsAuthor
+#        - App\Entity\SourceStatsCommitHistogram
+        - App\Entity\User

site/app/config/packages/algolia_search.yml

@@ -2,10 +2,10 @@ algolia_search:
     prefix: "%algolia_search_prefix%"
     indices:
         - name: projects
-          class: Librecores\ProjectRepoBundle\Entity\Project
+          class: App\Entity\Project
 
         - name: organization
-          class: Librecores\ProjectRepoBundle\Entity\Organization
+          class: App\Entity\Organization
 
         - name: user
-          class: Librecores\ProjectRepoBundle\Entity\User
+          class: App\Entity\User

site/app/config/packages/doctrine.yml

@@ -14,6 +14,13 @@ doctrine:
     orm:
         auto_generate_proxy_classes: "%kernel.debug%"
         auto_mapping: true
+        mappings:
+            App:
+                is_bundle: false
+                type: annotation
+                dir: '%kernel.project_dir%/src/App/Entity'
+                prefix: 'App\Entity'
+                alias: App
         dql:
             datetime_functions:
                 DAY: 'DoctrineExtensions\Query\Mysql\Day'

site/app/config/packages/fos_user.yml

@@ -1,7 +1,7 @@
 fos_user:
     db_driver: orm
     firewall_name: main
-    user_class: 'Librecores\ProjectRepoBundle\Entity\User'
+    user_class: 'App\Entity\User'
     service:
         user_manager: librecores_user_manager
         mailer: fos_user.mailer.twig_swift

site/src/App/DataFixtures/ORM/LoadBaseData.php

@@ -5,7 +5,7 @@
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
-use Librecores\ProjectRepoBundle\Entity\Organization;
+use App\Entity\Organization;
 
 /**
  * Create the required minimum database entries

site/src/App/DataFixtures/ORM/LoadDevTestData.php

@@ -5,11 +5,11 @@
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
-use Librecores\ProjectRepoBundle\Entity\GitSourceRepo;
-use Librecores\ProjectRepoBundle\Entity\Organization;
-use Librecores\ProjectRepoBundle\Entity\OrganizationMember;
-use Librecores\ProjectRepoBundle\Entity\Project;
-use Librecores\ProjectRepoBundle\Entity\User;
+use App\Entity\GitSourceRepo;
+use App\Entity\Organization;
+use App\Entity\OrganizationMember;
+use App\Entity\Project;
+use App\Entity\User;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
@@ -105,7 +105,7 @@ public function load(ObjectManager $manager)
      * @param string $username
      * @param string $password
      *
-     * @return \Librecores\ProjectRepoBundle\Entity\User
+     * @return \App\Entity\User
      */
     private function createUser($username, $password)
     {

site/src/Librecores/ProjectRepoBundle/Entity/ClassificationHierarchy.php → site/src/App/Entity/ClassificationHierarchy.php

@@ -1,15 +1,16 @@
 <?php
 
-namespace Librecores\ProjectRepoBundle\Entity;
+namespace App\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * A classification hierarchy for the projects
  *
- * This class contains classification categories that can be use to classify a project
- * for better categorization
+ * This class contains classification categories that can be use to classify a
+ * project for better categorization
  *
  * @author Sandip Kumar Bhuyan <[email protected]>
  *
@@ -130,7 +131,7 @@ public function setName($name)
     /**
      * Add child category
      *
-     * @param \Librecores\ProjectRepoBundle\Entity\ClassificationHierarchy $child
+     * @param ClassificationHierarchy $child
      *
      * @return ClassificationHierarchy
      */
@@ -144,7 +145,7 @@ public function addChild(ClassificationHierarchy $child)
     /**
      * Remove child category
      *
-     * @param \Librecores\ProjectRepoBundle\Entity\ClassificationHierarchy $child
+     * @param ClassificationHierarchy $child
      */
     public function removeChild(ClassificationHierarchy $child)
     {
@@ -154,7 +155,7 @@ public function removeChild(ClassificationHierarchy $child)
     /**
      * Get children category
      *
-     * @return \Doctrine\Common\Collections\Collection
+     * @return Collection
      */
     public function getChildren()
     {

site/src/Librecores/ProjectRepoBundle/Entity/Commit.php → site/src/App/Entity/Commit.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Librecores\ProjectRepoBundle\Entity;
+namespace App\Entity;
 
 use DateTime;
 use Doctrine\ORM\Mapping as ORM;

site/src/Librecores/ProjectRepoBundle/Entity/Contributor.php → site/src/App/Entity/Contributor.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Librecores\ProjectRepoBundle\Entity;
+namespace App\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;

site/src/Librecores/ProjectRepoBundle/Entity/GitSourceRepo.php → site/src/App/Entity/GitSourceRepo.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Librecores\ProjectRepoBundle\Entity;
+namespace App\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
@@ -24,7 +24,7 @@ public function __construct($url = null)
 
     /**
      * {@inheritDoc}
-     * @see \Librecores\ProjectRepoBundle\Entity\SourceRepo::getType()
+     * @see \App\Entity\SourceRepo::getType()
      */
     public function getType()
     {

site/src/Librecores/ProjectRepoBundle/Entity/LanguageStat.php → site/src/App/Entity/LanguageStat.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Librecores\ProjectRepoBundle\Entity;
+namespace App\Entity;
 
 /**
  * Statistics about a programming language in a source code repository

site/src/Librecores/ProjectRepoBundle/Entity/Organization.php → site/src/App/Entity/Organization.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Librecores\ProjectRepoBundle\Entity;
+namespace App\Entity;
 
 use DateTime;
 use Doctrine\Common\Collections\ArrayCollection;
@@ -99,6 +99,7 @@ class Organization
     private $creator;
 
     // metadata
+
     /**
      * When was this organization created?
      *

site/src/Librecores/ProjectRepoBundle/Entity/OrganizationMember.php → site/src/App/Entity/OrganizationMember.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Librecores\ProjectRepoBundle\Entity;
+namespace App\Entity;
 
 use DateTime;
 use Doctrine\ORM\Mapping as ORM;
@@ -23,20 +23,23 @@ class OrganizationMember
     const PERMISSION_SUPPORT = 'SUPPORT';
     const PERMISSION_MEMBER = 'MEMBER';
     const PERMISSION_ADMIN = 'ADMIN';
+
     /**
      * @var Organization
      *
      * @ORM\ManyToOne(targetEntity="Organization", inversedBy="members")
      * @ORM\JoinColumn(name="organizationId", referencedColumnName="id", nullable=FALSE)
      */
     protected $organization;
+
     /**
      * @var User
      *
      * @ORM\ManyToOne(targetEntity="User", inversedBy="organizationMemberships")
      * @ORM\JoinColumn(name="userId", referencedColumnName="id", nullable=FALSE)
      */
     protected $user;
+
     /**
      * @var string
      *
@@ -45,6 +48,7 @@ class OrganizationMember
      * @ORM\Column(type="string")
      */
     protected $permission = self::PERMISSION_REQUEST;
+
     /**
      * When was this mapping created?
      *
@@ -55,6 +59,7 @@ class OrganizationMember
     protected $createdAt;
 
     // metadata
+
     /**
      * When was this mapping last updated?
      *
@@ -63,6 +68,7 @@ class OrganizationMember
      * @ORM\Column(type="datetime")
      */
     protected $updatedAt;
+
     /**
      * @var int
      *

site/src/Librecores/ProjectRepoBundle/Entity/Project.php → site/src/App/Entity/Project.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Librecores\ProjectRepoBundle\Entity;
+namespace App\Entity;
 
 use DateTime;
 use Doctrine\Common\Collections\ArrayCollection;
@@ -34,6 +34,7 @@ class Project
 {
     const STATUS_ASSIGNED = 'ASSIGNED';
     const STATUS_UNASSIGNED = 'UNASSIGNED';
+
     /**
      * Classifications assigned to this project
      *
@@ -44,6 +45,7 @@ class Project
      * @ORM\JoinColumn(name="projectId", referencedColumnName="id")
      */
     protected $classifications;
+
     /**
      * Internal project ID
      *
@@ -54,6 +56,7 @@ class Project
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private $id;
+
     /**
      * Status of the project
      *
@@ -64,6 +67,7 @@ class Project
      * @ORM\Column(type="string", options={"default" : Project::STATUS_ASSIGNED})
      */
     private $status = self::STATUS_ASSIGNED;
+
     /**
      * User owning this project
      *
@@ -75,6 +79,7 @@ class Project
     private $parentUser;
 
     // Associations
+
     /**
      * Organization owning this project
      *
@@ -84,6 +89,7 @@ class Project
      * @ORM\JoinColumn(nullable=true)
      */
     private $parentOrganization;
+
     /**
      * Short name of the project
      *
@@ -157,7 +163,7 @@ class Project
     /**
      * @var SourceRepo
      *
-     * @Assert\Type(type="Librecores\ProjectRepoBundle\Entity\SourceRepo")
+     * @Assert\Type(type="App\Entity\SourceRepo")
      * @Assert\Valid()
      *
      * @ORM\OneToOne(targetEntity="SourceRepo", inversedBy="project", cascade={"persist", "remove"})

site/src/Librecores/ProjectRepoBundle/Entity/ProjectClassification.php → site/src/App/Entity/ProjectClassification.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Librecores\ProjectRepoBundle\Entity;
+namespace App\Entity;
 
 use DateTime;
 use Doctrine\ORM\Mapping as ORM;

site/src/Librecores/ProjectRepoBundle/Entity/ProjectRelease.php → site/src/App/Entity/ProjectRelease.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Librecores\ProjectRepoBundle\Entity;
+namespace App\Entity;
 
 use DateTime;
 

site/src/Librecores/ProjectRepoBundle/Entity/SourceRepo.php → site/src/App/Entity/SourceRepo.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Librecores\ProjectRepoBundle\Entity;
+namespace App\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;

site/src/Librecores/ProjectRepoBundle/Entity/SourceStats.php → site/src/App/Entity/SourceStats.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Librecores\ProjectRepoBundle\Entity;
+namespace App\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use InvalidArgumentException;

site/src/Librecores/ProjectRepoBundle/Entity/User.php → site/src/App/Entity/User.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Librecores\ProjectRepoBundle\Entity;
+namespace App\Entity;
 
 use DateTime;
 use Doctrine\Common\Collections\ArrayCollection;
@@ -30,6 +30,7 @@ class User extends BaseUser
 
 
     // OAuth-related entries
+
     /**
      * GitHub User ID provided by the OAuth service.
      *
@@ -73,6 +74,7 @@ class User extends BaseUser
     protected $googleOAuthAccessToken;
 
     // associations
+
     /**
      * @var ArrayCollection
      *
@@ -98,6 +100,7 @@ class User extends BaseUser
     protected $organizationMemberships;
 
     // profile data
+
     /**
      * Full (real) name of the user
      *
@@ -108,6 +111,7 @@ class User extends BaseUser
     protected $name;
 
     // metadata
+
     /**
      * When was this user created?
      *

site/src/App/RepoCrawler/CrawlerException.php

@@ -3,7 +3,7 @@
 namespace App\RepoCrawler;
 
 use Exception;
-use Librecores\ProjectRepoBundle\Entity\SourceRepo;
+use App\Entity\SourceRepo;
 use Throwable;
 
 class CrawlerException extends Exception