Minor - remove unused config, update phpdocs

7 years ago · 0514638f58
parent 7aca4a0bc9
commit 0514638f58
11 changed files with 104 additions and 180 deletions
--- a/config/packages/chamilo.yaml
+++ b/config/packages/chamilo.yaml
@ -1,89 +0,0 @@
-services:
-    # default configuration for services in *this* file
-    _defaults:
-        # automatically injects dependencies in your services
-        autowire: true
-        # automatically registers your services as commands, event subscribers, etc.
-        autoconfigure: true
-        # this means you cannot fetch services directly from the container via $container->get()
-        # if you need to do this, you can override this setting on individual services
-        public: true
-
-    # makes classes in src/ available to be used as services
-    # this creates a service per class whose id is the fully-qualified class name
-    AdminBundle\:
-        resource: '../../src/AdminBundle/*'
-        # you can exclude directories or files
-        # but if a service is unused, it's removed anyway
-        exclude: '../../src/AdminBundle/{ChamiloAdminBundle.php,Entity,Repository,Tests}'
-
-    ClassificationBundle\:
-        resource: '../../src/ClassificationBundle/*'
-        # you can exclude directories or files
-        # but if a service is unused, it's removed anyway
-        exclude: '../../src/ClassificationBundle/{ChamiloClassificationBundle.php,Entity,Admin,Document,Repository,Tests}'
-
-    ContactBundle\:
-        resource: '../../src/ContactBundle/*'
-        # you can exclude directories or files
-        # but if a service is unused, it's removed anyway
-        exclude: '../../src/ContactBundle/{ChamiloContactBundle.php,Entity,Admin,Controller,DependencyInjection,Form,Repository,Tests}'
-
-    Chamilo\CoreBundle\:
-        resource: '../../src/CoreBundle/*'
-        # you can exclude directories or files
-        # but if a service is unused, it's removed anyway
-        exclude: '../../src/CoreBundle/{Admin,Block,Component,Composer,DependencyInjection,EventListener,Form,Framework,Menu,Migrations,Security,Settings,Twig,Controller,ChamiloCoreBundle.php,Entity,Repository,Tests}'
-
-    Chamilo\CoreBundle\Controller\:
-        resource: '../../src/CoreBundle/Controller'
-        public: true
-        tags: ['controller.service_arguments']
-
-    Chamilo\UserBundle\:
-        resource: '../../src/UserBundle/*'
-        # you can exclude directories or files
-        # but if a service is unused, it's removed anyway
-        exclude: '../../src/UserBundle/{Admin,Block,Component,Composer,DependencyInjection,EventListener,Form,Framework,Menu,Migrations,Security,Settings,Twig,Controller,ChamiloUserBundle.php,Entity,Repository,Tests}'
-
-    # controllers are imported separately to make sure they're public
-    # and have a tag that allows actions to type-hint services
-#    CoreBundle\Controller\:
-#        resource: '../../src/CoreBundle/Controller'
-#        public: true
-#        tags: ['controller.service_arguments']
-
-
-# Doctrine audit
-sonata_doctrine_orm_admin:
-    audit:
-        force: false # Audits are set in the admin.yml files with audit:true
-
-# Grid default template
-#apy_data_grid:
-#    theme: ChamiloCoreBundle::grid.html.twig
-#
-
-# Platform settings (new)
-sylius_settings:
-    driver: doctrine/orm
-
-# Course settings
-chamilo_course:
-    driver: doctrine/orm
-#    resources:
-#        parameter:
-#            classes:
-#                model: Chamilo\CourseBundle\Entity\CCourseSetting
-#                repository: Chamilo\CourseBundle\Entity\Repository\CCourseSettingRepository
-
-doctrine_cache:
-    providers:
-        sylius_settings:
-            type: file_system
-        chamilo_settings:
-            type: file_system
-
-imports:
-    - {resource: ../../src/CoreBundle/Resources/config/services.yml}
-    - {resource: ../../vendor/knplabs/doctrine-behaviors/config/orm-services.yml}
--- a/config/packages/doctrine.yaml
+++ b/config/packages/doctrine.yaml
@ -7,6 +7,10 @@ doctrine:
        host: '%env(DATABASE_HOST)%'
        driver: 'pdo_mysql'
        charset: utf8mb4
+        default_table_options:
+            charset: utf8mb4
+            collate: utf8mb4_unicode_ci
+            row_format: DYNAMIC
        types:
            json: Sonata\Doctrine\Types\JsonType
    orm:
--- a/config/routes/chamilo.yaml
+++ b/config/routes/chamilo.yaml
@ -1,16 +0,0 @@
-chamilo_course:
-    resource: "@ChamiloCourseBundle/Resources/config/routing.yml"
-    prefix: /
-chamilo_contact:
-    resource: "@ChamiloContactBundle/Resources/config/routing.yml"
-    prefix: /contact
-#chamilo_installer:
-#    resource: "@ChamiloInstallerBundle/Resources/config/routing.yml"
-
-# Always at the end
-core_bundle:
-    resource: "@ChamiloCoreBundle/Resources/config/routing.yml"
-page_bundle:
-    resource: "@ChamiloPageBundle/Resources/config/routing.yml"
-faq:
-    resource: "@ChamiloFaqBundle/Resources/config/routing.yml"
--- a/config/services.yaml
+++ b/config/services.yaml
@ -19,3 +19,85 @@ parameters:
    sonata_media.cdn.host: /public/uploads/media
    sonata_page.varnish.command: 'if [ ! -r "/etc/varnish/secret" ]; then echo "VALID ERROR :/"; else varnishadm -S /etc/varnish/secret -T 127.0.0.1:6082 {{ COMMAND }} "{{ EXPRESSION }}"; fi;'
    router.request_context.base_url: '%url_append%'
+
+services:
+    # default configuration for services in *this* file
+    _defaults:
+        # automatically injects dependencies in your services
+        autowire: true
+        # automatically registers your services as commands, event subscribers, etc.
+        autoconfigure: true
+        # this means you cannot fetch services directly from the container via $container->get()
+        # if you need to do this, you can override this setting on individual services
+        public: true
+
+    # makes classes in src/ available to be used as services
+    # this creates a service per class whose id is the fully-qualified class name
+    AdminBundle\:
+        resource: '../src/AdminBundle/*'
+        # you can exclude directories or files
+        # but if a service is unused, it's removed anyway
+        exclude: '../src/AdminBundle/{ChamiloAdminBundle.php,Entity,Repository,Tests}'
+
+    ClassificationBundle\:
+        resource: '../src/ClassificationBundle/*'
+        # you can exclude directories or files
+        # but if a service is unused, it's removed anyway
+        exclude: '../src/ClassificationBundle/{ChamiloClassificationBundle.php,Entity,Admin,Document,Repository,Tests}'
+
+    ContactBundle\:
+        resource: '../src/ContactBundle/*'
+        # you can exclude directories or files
+        # but if a service is unused, it's removed anyway
+        exclude: '../src/ContactBundle/{ChamiloContactBundle.php,Entity,Admin,Controller,DependencyInjection,Form,Repository,Tests}'
+
+    Chamilo\CoreBundle\:
+        resource: '../src/CoreBundle/*'
+        # you can exclude directories or files
+        # but if a service is unused, it's removed anyway
+        exclude: '../src/CoreBundle/{Admin,Block,Component,Composer,DependencyInjection,EventListener,Form,Framework,Menu,Migrations,Security,Settings,Twig,Controller,ChamiloCoreBundle.php,Entity,Repository,Tests}'
+
+    Chamilo\CoreBundle\Controller\:
+        resource: '../src/CoreBundle/Controller'
+        public: true
+        tags: ['controller.service_arguments']
+
+    Chamilo\UserBundle\:
+        resource: '../src/UserBundle/*'
+        # you can exclude directories or files
+        # but if a service is unused, it's removed anyway
+        exclude: '../src/UserBundle/{Admin,Block,Component,Composer,DependencyInjection,EventListener,Form,Framework,Menu,Migrations,Security,Settings,Twig,Controller,ChamiloUserBundle.php,Entity,Repository,Tests}'
+
+# Doctrine audit
+sonata_doctrine_orm_admin:
+    audit:
+        force: false # Audits are set in the admin.yml files with audit:true
+
+# Grid default template
+#apy_data_grid:
+#    theme: ChamiloCoreBundle::grid.html.twig
+#
+
+# Platform settings (new)
+sylius_settings:
+    driver: doctrine/orm
+
+# Course settings
+chamilo_course:
+    driver: doctrine/orm
+#    resources:
+#        parameter:
+#            classes:
+#                model: Chamilo\CourseBundle\Entity\CCourseSetting
+#                repository: Chamilo\CourseBundle\Entity\Repository\CCourseSettingRepository
+
+doctrine_cache:
+    providers:
+        sylius_settings:
+            type: file_system
+        chamilo_settings:
+            type: file_system
+
+imports:
+    - {resource: ../src/CoreBundle/Resources/config/services.yml}
+    - {resource: ../vendor/knplabs/doctrine-behaviors/config/orm-services.yml}
--- a/src/ClassificationBundle/Entity/Category.php
+++ b/src/ClassificationBundle/Entity/Category.php
@ -1,25 +1,14 @@
 <?php
-
-/**
- * This file is part of the <name> project.
- *
- * (c) <yourname> <youremail>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+/* For licensing terms, see /license.txt */

 namespace Chamilo\ClassificationBundle\Entity;

-use Sonata\ClassificationBundle\Entity\BaseCategory as BaseCategory;
+use Sonata\ClassificationBundle\Entity\BaseCategory;

 /**
- * This file has been generated by the Sonata EasyExtends bundle ( http://sonata-project.org/bundles/easy-extends ).
- *
- * References :
- *   working with object : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/working-with-objects/en
+ * Class Category.
 *
- * @author <yourname> <youremail>
+ * @package Chamilo\ClassificationBundle\Entity
 */
 class Category extends BaseCategory
 {
@ -33,7 +22,7 @@ class Category extends BaseCategory
     *
     * @return int $id
     */
-    public function getId()
+    public function getId(): int
    {
        return $this->id;
    }
--- a/src/ClassificationBundle/Entity/Collection.php
+++ b/src/ClassificationBundle/Entity/Collection.php
@ -1,25 +1,14 @@
 <?php
-
-/**
- * This file is part of the <name> project.
- *
- * (c) <yourname> <youremail>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+/* For licensing terms, see /license.txt */

 namespace Chamilo\ClassificationBundle\Entity;

-use Sonata\ClassificationBundle\Entity\BaseCollection as BaseCollection;
+use Sonata\ClassificationBundle\Entity\BaseCollection;

 /**
- * This file has been generated by the Sonata EasyExtends bundle ( http://sonata-project.org/bundles/easy-extends ).
- *
- * References :
- *   working with object : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/working-with-objects/en
+ * Class Collection.
 *
- * @author <yourname> <youremail>
+ * @package Chamilo\ClassificationBundle\Entity
 */
 class Collection extends BaseCollection
 {
@ -33,7 +22,7 @@ class Collection extends BaseCollection
     *
     * @return int $id
     */
-    public function getId()
+    public function getId(): int
    {
        return $this->id;
    }
--- a/src/ClassificationBundle/Entity/Context.php
+++ b/src/ClassificationBundle/Entity/Context.php
@ -3,7 +3,7 @@

 namespace Chamilo\ClassificationBundle\Entity;

-use Sonata\ClassificationBundle\Entity\BaseContext as BaseContext;
+use Sonata\ClassificationBundle\Entity\BaseContext;

 /**
 * Class Context.
--- a/src/ClassificationBundle/Entity/Tag.php
+++ b/src/ClassificationBundle/Entity/Tag.php
@ -1,25 +1,14 @@
 <?php
-
-/**
- * This file is part of the <name> project.
- *
- * (c) <yourname> <youremail>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+/* For licensing terms, see /license.txt */

 namespace Chamilo\ClassificationBundle\Entity;

-use Sonata\ClassificationBundle\Entity\BaseTag as BaseTag;
+use Sonata\ClassificationBundle\Entity\BaseTag;

 /**
- * This file has been generated by the Sonata EasyExtends bundle ( http://sonata-project.org/bundles/easy-extends ).
- *
- * References :
- *   working with object : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/working-with-objects/en
+ * Class Tag.
 *
- * @author <yourname> <youremail>
+ * @package Chamilo\ClassificationBundle\Entity
 */
 class Tag extends BaseTag
 {
@ -33,7 +22,7 @@ class Tag extends BaseTag
     *
     * @return int $id
     */
-    public function getId()
+    public function getId(): int
    {
        return $this->id;
    }
--- a/src/ClassificationBundle/Resources/config/doctrine/Category.mongodb.xml
+++ b/src/ClassificationBundle/Resources/config/doctrine/Category.mongodb.xml
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mongo-mapping
-        xmlns="http://doctrine-project.org/schemas/orm/doctrine-mongo-mapping"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mongo-mapping
-                    http://doctrine-project.org/schemas/orm/doctrine-mongo-mapping.xsd">
-
-    <document name="Chamilo\ClassificationBundle\Document\Category"
-              collection="classificationCategory">
-        <id fieldName="id" id="true"/>
-    </document>
-</doctrine-mongo-mapping>
--- a/src/ClassificationBundle/Resources/config/doctrine/Context.orm.xml
+++ b/src/ClassificationBundle/Resources/config/doctrine/Context.orm.xml
@ -16,8 +16,8 @@
            table="classification__context"
            repository-class="Doctrine\ORM\EntityRepository">

-        <id name="id" type="string" column="id">
-            <generator strategy="NONE"/>
+        <id name="id" type="integer" column="id">
+            <generator strategy="AUTO"/>
        </id>
        <options>
            <option name="row_format">DYNAMIC</option>
--- a/src/ClassificationBundle/Resources/config/doctrine/Tag.mongodb.xml
+++ b/src/ClassificationBundle/Resources/config/doctrine/Tag.mongodb.xml
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<doctrine-mongo-mapping
-        xmlns="http://doctrine-project.org/schemas/orm/doctrine-mongo-mapping"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mongo-mapping
-                    http://doctrine-project.org/schemas/orm/doctrine-mongo-mapping.xsd">
-
-    <document name="Chamilo\ClassificationBundle\Document\Tag"
-              collection="newsTag">
-        <id fieldName="id" id="true"/>
-    </document>
-</doctrine-mongo-mapping>