Resolve merge issues

Some 2.5 and 2.6 features got mixed up during merge. Possibly due to the fact that one of the 2.5 features was never merged to master. And somehow conflicted with the changes from the 2.6 release.
SURFnet · Jun 16, 2020 · 7e92e4e · 7e92e4e
1 parent 526cf51
commit 7e92e4e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/...oviderDashboard/Infrastructure/DashboardBundle/Controller/EntityResetSecretController.php b/...oviderDashboard/Infrastructure/DashboardBundle/Controller/EntityResetSecretController.php
@@ -22,7 +22,9 @@
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use Surfnet\ServiceProviderDashboard\Application\Command\Entity\PushMetadataCommand;
 use Surfnet\ServiceProviderDashboard\Application\Command\Entity\ResetOidcSecretCommand;
+use Surfnet\ServiceProviderDashboard\Domain\Entity\Entity;
 use Surfnet\ServiceProviderDashboard\Infrastructure\Manage\Dto\Protocol;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;

diff --git a/...net/ServiceProviderDashboard/Infrastructure/DashboardBundle/Resources/config/services.yml b/...net/ServiceProviderDashboard/Infrastructure/DashboardBundle/Resources/config/services.yml
@@ -133,16 +133,6 @@ services:
         tags:
             - { name: tactician.handler, command: Surfnet\ServiceProviderDashboard\Application\Command\Entity\PushMetadataCommand }
 
-    surfnet.dashboard.command_handler.push_metadata:
-        class: Surfnet\ServiceProviderDashboard\Application\CommandHandler\Entity\PushMetadataCommandHandler
-        arguments:
-            - '@surfnet.manage.publish_service'
-            - '@session.flash_bag'
-            - '@logger'
-        public: true
-        tags:
-            - { name: tactician.handler, command: Surfnet\ServiceProviderDashboard\Application\Command\Entity\PushMetadataCommand }
-
     surfnet.dashboard.command_handler.update_entity_acl:
         class: Surfnet\ServiceProviderDashboard\Application\CommandHandler\Entity\UpdateEntityAclCommandHandler
         arguments:

diff --git a/...ceProviderDashboard/Infrastructure/DashboardBundle/Resources/translations/messages.en.yml b/...ceProviderDashboard/Infrastructure/DashboardBundle/Resources/translations/messages.en.yml
@@ -407,7 +407,6 @@ entity.edit.information.oidcng.uidAttribute: Text should be set in web translati
 entity.edit.information.oidcng.preferredLanguageAttribute: Text should be set in web translations
 entity.edit.information.oidcng.personalCodeAttribute: Text should be set in web translations
 entity.edit.information.oidcng.scopedAffiliationAttribute: Text should be set in web translations
-entity.edit.information.oidcng.eduPersonTargetedIDAttribute: Text should be set in web translations
 entity.edit.information.comments: Text should be set in web translations
 entity.edit.information.nameIdFormat: Text should be set in web translations
 entity.edit.information.subjectType: Text should be set in web translations