Skip to content

Commit

Permalink
Merge pull request #5247 from Catrobat/services
Browse files Browse the repository at this point in the history
Reduce services.php by using attributes, and better structured config
  • Loading branch information
dmetzner authored Sep 16, 2024
2 parents dff39d4 + 513597c commit df670ed
Show file tree
Hide file tree
Showing 83 changed files with 959 additions and 1,314 deletions.
10 changes: 0 additions & 10 deletions config/features.php

This file was deleted.

11 changes: 11 additions & 0 deletions config/packages/bugsnag.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

declare(strict_types=1);

use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;

return static function (ContainerConfigurator $containerConfigurator): void {
$containerConfigurator->extension('bugsnag', [
'api_key' => '%env(BUGSNAG_API_KEY)%',
]);
};
2 changes: 0 additions & 2 deletions config/packages/bugsnag.yaml

This file was deleted.

20 changes: 20 additions & 0 deletions config/packages/feature_flags.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php

declare(strict_types=1);

use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;

return static function (ContainerConfigurator $containerConfigurator): void {
$parameters = $containerConfigurator->parameters();
$parameters->set(
'feature_flags',
[
'Test-Flag' => false,
'Sidebar-Studio-Link-Feature' => false,
'GET_projects_elastica' => false,
'remix-graph' => false, // performance issues
'sign-apk' => false, // not allowed by Google
'force-account-verification' => false,
]
);
};
4 changes: 2 additions & 2 deletions config/packages/fos_elastica.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
'url' => '%env(ELASTICSEARCH_URL)%',
],
[
'host' => '%es_host%',
'host' => '%env(ES_HOST)%',
],
[
'port' => '%es_port%',
'port' => '%env(ES_PORT)%',
],
],
],
Expand Down
3 changes: 2 additions & 1 deletion config/packages/security.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use App\Security\Authentication\WebView\WebviewAuthenticator;
use App\Security\Authentication\WebView\WebviewJWTAuthenticator;
use App\Security\OAuth\HwiOauthUserProvider;
use App\Security\OAuth\OAuthSuccessHandler;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
use Symfony\Component\Security\Core\User\UserInterface;

Expand Down Expand Up @@ -88,7 +89,7 @@
'login_path' => '/login',
'use_forward' => false,
'failure_path' => '/app/login',
'success_handler' => 'catroweb.oauth_success_handler',
'success_handler' => OAuthSuccessHandler::class,
'oauth_user_provider' => [
'service' => HwiOauthUserProvider::class,
],
Expand Down
Loading

0 comments on commit df670ed

Please sign in to comment.