Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove civicrm configs elifesciences/issues#9017 #1937

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
+1 −35
Open

remove civicrm configs elifesciences/issues#9017 #1937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d105d34
remove civicrm configs elifesciences/issues#9017
ali-tm-amin Dec 17, 2024
ebaa1eb
remove civicrm configs elifesciences/issues#9017
ali-tm-amin Dec 17, 2024
e2783a6
remove civicrm configs elifesciences/issues#9017
ali-tm-amin Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .docker/parameters.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ parameters:
submit_url: https://submit.elifesciences.org/
submit_url_redirects:
- .*\.elifesciences.org$
crm_url: https://crm.elifesciences.org/crm/civicrm/
crm_api_url: https://crm.elifesciences.org/crm/sites/all/modules/civicrm/extern/rest.php
crm_api_key: ~
crm_api_site_key: ~
gtm_id: ~
google_optimize_id: ~
cb_id: ~
Expand Down
10 changes: 0 additions & 10 deletions app/config/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,6 @@ csa_guzzle:
headers:
Authorization: '%api_key%'
timeout: '%api_timeout_slow%'
elife_crm:
config:
base_uri: '%crm_url%'
connect_timeout: '%api_connect_timeout_slow%'
timeout: '%api_timeout_slow%'
elife_crm_api:
config:
base_uri: '%crm_api_url%'
connect_timeout: '%api_connect_timeout_slow%'
timeout: '%api_timeout_slow%'
oauth:
config:
connect_timeout: '%api_connect_timeout_slow%'
Expand Down
1 change: 0 additions & 1 deletion app/config/config_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ parameters:
size:
width: 800
height: 600
crm_url: http://crm.elifesciences.org/crm/civicrm/
feature_xpub: '%env(FEATURE_XPUB)%'
env(FEATURE_XPUB): false
oauth2_client_id: journal_client_id
Expand Down
4 changes: 0 additions & 4 deletions app/config/parameters.yml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ parameters:
submit_url: https://submit.elifesciences.org/
submit_url_redirects:
- .*\.elifesciences.org$
crm_url: https://crm.elifesciences.org/crm/civicrm/
crm_api_url: https://crm.elifesciences.org/crm/sites/all/modules/civicrm/extern/rest.php
crm_api_key: ~
crm_api_site_key: ~
gtm_id: ~
google_optimize_id: ~
cb_id: ~
Expand Down
12 changes: 0 additions & 12 deletions app/config/services.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@ services:
arguments:
- '@csa_guzzle.client.elife_api_search_page'

elife.api_client.client.crm_api:
class: eLife\CiviContacts\Guzzle\CiviCrmClient
arguments:
- '@csa_guzzle.client.elife_crm_api'
- '%crm_api_key%'
- '%crm_api_site_key%'

elife.api_client.client.warning_checking:
class: eLife\ApiClient\HttpClient\WarningCheckingHttpClient
decorates: elife.api_client.client
Expand Down Expand Up @@ -180,11 +173,6 @@ services:
- name: form.type_extension
extended_type: Symfony\Component\Form\Extension\Core\Type\EmailType

elife.journal.goutte:
class: Goutte\Client
calls:
- ['setClient', ['@csa_guzzle.client.elife_crm']]

elife.journal.guzzle.cache:
class: Kevinrob\GuzzleCache\CacheMiddleware
public: false
Expand Down
3 changes: 0 additions & 3 deletions app/config/services_dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
services:

elife.api_client.client.crm_api:
class: eLife\Journal\Guzzle\MockCiviCrmClient

elife.journal.google_client.opt_out_unsubscribe_reason:
class: eLife\Journal\GoogleClient\MockOptoutUnsubscribeReason
2 changes: 1 addition & 1 deletion src/DependencyInjection/GuzzleMiddlewarePass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ final class GuzzleMiddlewarePass implements CompilerPassInterface
{
public function process(ContainerBuilder $container)
{
foreach (['csa_guzzle.client.elife_crm', 'csa_guzzle.client.oauth', 'csa_guzzle.client.streamer', 'elife.journal.guzzle.cache.client'] as $id) {
foreach (['csa_guzzle.client.oauth', 'csa_guzzle.client.streamer', 'elife.journal.guzzle.cache.client'] as $id) {
$handler = $container->getDefinition($id)->getArgument(0)['handler'];

$handler->setMethodCalls(array_filter($handler->getMethodCalls(), function (array $methodCall) {
Expand Down
Loading