Update and audit existing project dependencies for Symfony/Flex.

- Converted all non-flex bundles with available bundles into Symfony/Flex.
- Updated namespaces to more closely match Symfony.
- Removed unnecessary dependencies and recipes.
- Executed Symfony/Flex recipes to create default configs.
- Improved composer.json scripts.

config/bootstrap.php

@@ -6,7 +6,7 @@ require dirname(__DIR__) . '/vendor/autoload.php';
 
 // Load cached env vars if the .env.local.php file exists
 // Run "composer dump-env prod" to create it (requires symfony/flex >=1.2)
-if (is_array($env = @include dirname(__DIR__) . '/.env.local.php') && ($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? $env['APP_ENV']) === $env['APP_ENV']) {
+if (is_array($env = @include dirname(__DIR__) . '/.env.local.php') && (!isset($env['APP_ENV']) || ($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? $env['APP_ENV']) === $env['APP_ENV'])) {
     foreach ($env as $k => $v) {
         $_ENV[$k] = $_ENV[$k] ?? (isset($_SERVER[$k]) && 0 !== strpos($k, 'HTTP_') ? $_SERVER[$k] : $v);
     }

config/bundles.php

@@ -9,4 +9,7 @@ return [
     DAMA\DoctrineTestBundle\DAMADoctrineTestBundle::class => ['test' => true],
     Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
     Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
+    Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
+    Nelmio\CorsBundle\NelmioCorsBundle::class => ['all' => true],
+    Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true],
 ];

config/packages/api_platform.yaml

@@ -1,39 +1,39 @@
 api_platform:
-    graphql:
-        graphiql:
-            enabled: false
-        graphql_playground:
-            enabled: false
-    mapping:
-        paths: ['%kernel.project_dir%/core']
-    patch_formats:
-        json: ['application/merge-patch+json']
-        graphql: ['application/graphql']
-    swagger:
-        versions: [3]
-    oauth:
-        # To enable or disable oauth.
-        enabled: true
+  graphql:
+    graphiql:
+      enabled: false
+    graphql_playground:
+      enabled: false
+  mapping:
+    paths: ['%kernel.project_dir%/core']
+  patch_formats:
+    json: ['application/merge-patch+json']
+    graphql: ['application/graphql']
+  swagger:
+    versions: [3]
+  oauth:
+    # To enable or disable oauth.
+    enabled: true
 
-        # The oauth client id.
-        clientId: 'scrmfe'
+    # The oauth client id.
+    clientId: 'scrmfe'
 
-        # The oauth client secret.
-        clientSecret: 'scrmfe'
+    # The oauth client secret.
+    clientSecret: 'scrmfe'
 
-        # The oauth type.
-        type: 'oauth2'
+    # The oauth type.
+    type: 'oauth2'
 
-        # The oauth flow grant type.
-        flow: 'password'
+    # The oauth flow grant type.
+    flow: 'password'
 
-        # The oauth token url.
-        tokenUrl: '/oauth/v2/token'
+    # The oauth token url.
+    tokenUrl: '/oauth/v2/token'
 
-        # The oauth authentication url.
-        authorizationUrl: '/oauth/v2/auth'
+    # The oauth authentication url.
+    authorizationUrl: '/oauth/v2/auth'
 
-        # The oauth scopes.
-        scopes: []
+    # The oauth scopes.
+    scopes: []
 
-    enable_swagger_ui: false
+  enable_swagger_ui: false

config/packages/cache.yaml

@@ -1,19 +1,19 @@
 framework:
-    cache:
-        # Unique name of your app: used to compute stable namespaces for cache keys.
-        #prefix_seed: your_vendor_name/app_name
+  cache:
+  # Unique name of your app: used to compute stable namespaces for cache keys.
+  #prefix_seed: your_vendor_name/app_name
 
-        # The "app" cache stores to the filesystem by default.
-        # The data in this cache should persist between deploys.
-        # Other options include:
+  # The "app" cache stores to the filesystem by default.
+  # The data in this cache should persist between deploys.
+  # Other options include:
 
-        # Redis
-        #app: cache.adapter.redis
-        #default_redis_provider: redis://localhost
+  # Redis
+  #app: cache.adapter.redis
+  #default_redis_provider: redis://localhost
 
-        # APCu (not recommended with heavy random-write workloads as memory fragmentation can cause perf issues)
-        #app: cache.adapter.apcu
+  # APCu (not recommended with heavy random-write workloads as memory fragmentation can cause perf issues)
+  #app: cache.adapter.apcu
 
-        # Namespaced pools use the above "app" backend by default
-        #pools:
-            #my.dedicated.cache: null
+  # Namespaced pools use the above "app" backend by default
+  #pools:
+  #my.dedicated.cache: null

config/packages/dev/monolog.yaml

@@ -1,19 +1,19 @@
 monolog:
-    handlers:
-        main:
-            type: stream
-            path: "%kernel.logs_dir%/%kernel.environment%.log"
-            level: debug
-            channels: ["!event"]
-        # uncomment to get logging in your browser
-        # you may have to allow bigger header sizes in your Web server configuration
-        #firephp:
-        #    type: firephp
-        #    level: info
-        #chromephp:
-        #    type: chromephp
-        #    level: info
-        console:
-            type: console
-            process_psr_3_messages: false
-            channels: ["!event", "!doctrine", "!console"]
+  handlers:
+    main:
+      type: stream
+      path: "%kernel.logs_dir%/%kernel.environment%.log"
+      level: debug
+      channels: ["!event"]
+    # uncomment to get logging in your browser
+    # you may have to allow bigger header sizes in your Web server configuration
+    #firephp:
+    #    type: firephp
+    #    level: info
+    #chromephp:
+    #    type: chromephp
+    #    level: info
+    console:
+      type: console
+      process_psr_3_messages: false
+      channels: ["!event", "!doctrine", "!console"]

config/packages/doctrine.yaml

@@ -1,18 +1,18 @@
 doctrine:
-    dbal:
-        url: '%env(resolve:DATABASE_URL)%'
+  dbal:
+    url: '%env(resolve:DATABASE_URL)%'
 
-        # IMPORTANT: You MUST configure your server version,
-        # either here or in the DATABASE_URL env var (see .env file)
-        #server_version: '5.7'
-    orm:
-        auto_generate_proxy_classes: true
-        naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
-        auto_mapping: true
-        mappings:
-            App:
-                is_bundle: false
-                type: annotation
-                dir: '%kernel.project_dir%/core/modules'
-                prefix: 'SuiteCRM\Core\Modules\'
-                alias: App
+    # IMPORTANT: You MUST configure your server version,
+    # either here or in the DATABASE_URL env var (see .env file)
+    #server_version: '5.7'
+  orm:
+    auto_generate_proxy_classes: true
+    naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
+    auto_mapping: true
+    mappings:
+      App:
+        is_bundle: false
+        type: annotation
+        dir: '%kernel.project_dir%/core/modules'
+        prefix: 'SuiteCRM\Core\Modules\'
+        alias: App

config/packages/doctrine_migrations.yaml

@@ -0,0 +1,5 @@
+doctrine_migrations:
+  dir_name: '%kernel.project_dir%/src/Migrations'
+  # namespace is arbitrary but should be different from App\Migrations
+  # as migrations classes should NOT be autoloaded
+  namespace: DoctrineMigrations

config/packages/framework.yaml

@@ -1,16 +1,16 @@
 framework:
-    secret: '%env(APP_SECRET)%'
-    #csrf_protection: true
-    #http_method_override: true
+  secret: '%env(APP_SECRET)%'
+  #csrf_protection: true
+  #http_method_override: true
 
-    # Enables session support. Note that the session will ONLY be started if you read or write from it.
-    # Remove or comment this section to explicitly disable session support.
-    session:
-        handler_id: null
-        cookie_secure: auto
-        cookie_samesite: lax
+  # Enables session support. Note that the session will ONLY be started if you read or write from it.
+  # Remove or comment this section to explicitly disable session support.
+  session:
+    handler_id: null
+    cookie_secure: auto
+    cookie_samesite: lax
 
-    #esi: true
-    #fragments: true
-    php_errors:
-        log: true
+  #esi: true
+  #fragments: true
+  php_errors:
+    log: true

config/packages/nelmio_cors.yaml

@@ -0,0 +1,10 @@
+nelmio_cors:
+  defaults:
+    origin_regex: true
+    allow_origin: ['%env(CORS_ALLOW_ORIGIN)%']
+    allow_methods: ['GET', 'OPTIONS', 'POST', 'PUT', 'PATCH', 'DELETE']
+    allow_headers: ['Content-Type', 'Authorization']
+    expose_headers: ['Link']
+    max_age: 3600
+  paths:
+    '^/': null

config/packages/prod/doctrine.yaml

@@ -1,20 +1,20 @@
 doctrine:
-    orm:
-        auto_generate_proxy_classes: false
-        metadata_cache_driver:
-            type: pool
-            pool: doctrine.system_cache_pool
-        query_cache_driver:
-            type: pool
-            pool: doctrine.system_cache_pool
-        result_cache_driver:
-            type: pool
-            pool: doctrine.result_cache_pool
+  orm:
+    auto_generate_proxy_classes: false
+    metadata_cache_driver:
+      type: pool
+      pool: doctrine.system_cache_pool
+    query_cache_driver:
+      type: pool
+      pool: doctrine.system_cache_pool
+    result_cache_driver:
+      type: pool
+      pool: doctrine.result_cache_pool
 
 framework:
-    cache:
-        pools:
-            doctrine.result_cache_pool:
-                adapter: cache.app
-            doctrine.system_cache_pool:
-                adapter: cache.system
+  cache:
+    pools:
+      doctrine.result_cache_pool:
+        adapter: cache.app
+      doctrine.system_cache_pool:
+        adapter: cache.system

config/packages/prod/monolog.yaml

@@ -1,23 +1,25 @@
 monolog:
-    handlers:
-        main:
-            type: fingers_crossed
-            action_level: error
-            handler: nested
-            excluded_http_codes: [404, 405]
-        nested:
-            type: stream
-            path: "%kernel.logs_dir%/%kernel.environment%.log"
-            level: debug
-        console:
-            type: console
-            process_psr_3_messages: false
-            channels: ["!event", "!doctrine"]
-        deprecation:
-            type: stream
-            path: "%kernel.logs_dir%/%kernel.environment%.deprecations.log"
-        deprecation_filter:
-            type: filter
-            handler: deprecation
-            max_level: info
-            channels: ["php"]
+  handlers:
+    main:
+      type: fingers_crossed
+      action_level: error
+      handler: nested
+      excluded_http_codes: [404, 405]
+      # Prevents memory leaks
+      buffer_size:  50
+    nested:
+      type: stream
+      path: "%kernel.logs_dir%/%kernel.environment%.log"
+      level: debug
+    console:
+      type: console
+      process_psr_3_messages: false
+      channels: ["!event", "!doctrine"]
+    deprecation:
+      type: stream
+      path: "%kernel.logs_dir%/%kernel.environment%.deprecations.log"
+    deprecation_filter:
+      type: filter
+      handler: deprecation
+      max_level: info
+      channels: ["php"]

config/packages/prod/routing.yaml

@@ -1,3 +1,3 @@
 framework:
-    router:
-        strict_requirements: null
+  router:
+    strict_requirements: null

config/packages/routing.yaml

@@ -1,3 +1,3 @@
 framework:
-    router:
-        utf8: true
+  router:
+    utf8: true

config/packages/security.yaml

@@ -1,22 +1,10 @@
 security:
-    # https://symfony.com/doc/current/security.html#where-do-users-come-from-user-providers
-    providers:
-        in_memory: { memory: null }
-    firewalls:
-        dev:
-            pattern: ^/(_(profiler|wdt)|css|images|js)/
-            security: false
-        main:
-            anonymous: lazy
-
-            # activate different ways to authenticate
-            # https://symfony.com/doc/current/security.html#firewalls-authentication
-
-            # https://symfony.com/doc/current/security/impersonating_user.html
-            # switch_user: true
-
-    # Easy way to control access for large sections of your site
-    # Note: Only the *first* access control that matches will be used
-    access_control:
-        # - { path: ^/admin, roles: ROLE_ADMIN }
-        # - { path: ^/profile, roles: ROLE_USER }
+  providers:
+    in_memory: { memory: null }
+  firewalls:
+    dev:
+      pattern: ^/(_(profiler|wdt)|css|images|js)/
+      security: false
+    main:
+      anonymous: lazy
+  access_control:

config/packages/test/dama_doctrine_test_bundle.yaml

@@ -1,4 +1,4 @@
 dama_doctrine_test:
-    enable_static_connection: true
-    enable_static_meta_data_cache: true
-    enable_static_query_cache: true
+  enable_static_connection: true
+  enable_static_meta_data_cache: true
+  enable_static_query_cache: true

config/packages/test/framework.yaml

@@ -1,4 +1,4 @@
 framework:
-    test: true
-    session:
-        storage_id: session.storage.mock_file
+  test: true
+  session:
+    storage_id: session.storage.mock_file

config/packages/test/monolog.yaml

@@ -1,7 +1,12 @@
 monolog:
-    handlers:
-        main:
-            type: stream
-            path: "%kernel.logs_dir%/%kernel.environment%.log"
-            level: debug
-            channels: ["!event"]
+  handlers:
+    main:
+      type: fingers_crossed
+      action_level: error
+      handler: nested
+      excluded_http_codes: [404, 405]
+      channels: ["!event"]
+    nested:
+      type: stream
+      path: "%kernel.logs_dir%/%kernel.environment%.log"
+      level: debug

config/packages/test/twig.yaml

@@ -1,2 +1,2 @@
 twig:
-    strict_variables: true
+  strict_variables: true

config/packages/test/validator.yaml

@@ -1,3 +1,3 @@
 framework:
-    validation:
-        not_compromised_password: false
+  validation:
+    not_compromised_password: false

config/packages/twig.yaml

@@ -1,2 +1,2 @@
 twig:
-    default_path: '%kernel.project_dir%/templates'
+  default_path: '%kernel.project_dir%/templates'

config/packages/validator.yaml

@@ -1,8 +1,8 @@
 framework:
-    validation:
-        email_validation_mode: html5
+  validation:
+    email_validation_mode: html5
 
-        # Enables validator auto-mapping support.
-        # For instance, basic validation constraints will be inferred from Doctrine's metadata.
-        #auto_mapping:
-        #    App\Entity\: []
+    # Enables validator auto-mapping support.
+    # For instance, basic validation constraints will be inferred from Doctrine's metadata.
+    #auto_mapping:
+    #    App\Entity\: []

config/routes/annotations.yaml

@@ -0,0 +1,3 @@
+#controllers:
+#  resource: ../../src/Controller/
+#  type: annotation

config/routes/api_platform.yaml

@@ -1,4 +1,4 @@
 api_platform:
-    resource: .
-    type: api_platform
-    prefix: /api
+  resource: .
+  type: api_platform
+  prefix: /api

config/routes/dev/framework.yaml

@@ -1,3 +1,3 @@
 _errors:
-    resource: '@FrameworkBundle/Resources/config/routing/errors.xml'
-    prefix: /_error
+  resource: '@FrameworkBundle/Resources/config/routing/errors.xml'
+  prefix: /_error

config/services.yaml

@@ -1,28 +1,28 @@
 framework:
-    secret: "%secret%"
+  secret: "%secret%"
 
 parameters:
-    secret: ThisTokenIsNotSoSecretChangeIt
+  secret: ThisTokenIsNotSoSecretChangeIt
 
 services:
-    # default configuration for services in *this* file
-    _defaults:
-        autowire: true      # Automatically injects dependencies in your services.
-        autoconfigure: true # Automatically registers your services as commands, event subscribers, etc.
-        bind:
-            $projectDir: '%kernel.project_dir%'
+  # default configuration for services in *this* file
+  _defaults:
+    autowire: true      # Automatically injects dependencies in your services.
+    autoconfigure: true # Automatically registers your services as commands, event subscribers, etc.
+    bind:
+      $projectDir: '%kernel.project_dir%'
 
-    # makes classes in src/ available to be used as services
-    # this creates a service per class whose id is the fully-qualified class name
-    App\:
-        resource: '../core/src/*'
-        exclude: '../core/src/{DependencyInjection,Entity,Migrations,Tests,Kernel.php}'
+  # makes classes in src/ available to be used as services
+  # this creates a service per class whose id is the fully-qualified class name
+  App\:
+    resource: '../core/src/*'
+    exclude: '../core/src/{DependencyInjection,Entity,Migrations,Tests,Kernel.php}'
 
-    # controllers are imported separately to make sure services can be injected
-    # as action arguments even if you don't extend any base controller class
-    SuiteCRM\Core\Modules\:
-        resource: '../core/modules/'
-        tags: ['controller.service_arguments']
+  # controllers are imported separately to make sure services can be injected
+  # as action arguments even if you don't extend any base controller class
+  SuiteCRM\Core\Modules\:
+    resource: '../core/modules/'
+    tags: ['controller.service_arguments']
 
-    # add more service definitions when explicit configuration is needed
-    # please note that last definitions always *replace* previous ones
+  # add more service definitions when explicit configuration is needed
+  # please note that last definitions always *replace* previous ones