Merge pull request #1927 from OpenConext/upgrade-84

Merge maintenance work into main

Author: johanib

composer.json

@@ -23,8 +23,8 @@
         "ext-openssl": "*",
         "ext-pdo": "*",
         "beberlei/assert": "^3.3.3",
-        "composer/package-versions-deprecated": "^1.11.99.5",
-        "doctrine/dbal": "^3.10.3",
+        "composer/package-versions-deprecated": "^1.11",
+        "doctrine/dbal": "^4.3.3",
         "doctrine/doctrine-bundle": "^2.13.3",
         "doctrine/doctrine-migrations-bundle": "^3.6.0",
         "doctrine/orm": "^3.5.7",

composer.lock

@@ -23,6 +23,10 @@ doctrine:
             engineblock_collab_person_uuid: OpenConext\EngineBlockBundle\Doctrine\Type\CollabPersonUuidType
             engineblock_metadata_coins: OpenConext\EngineBlockBundle\Doctrine\Type\MetadataCoinType
             engineblock_metadata_mdui: OpenConext\EngineBlockBundle\Doctrine\Type\MetadataMduiType
+
+            array: OpenConext\EngineBlockBundle\Doctrine\Type\SerializedArrayType
+            object: OpenConext\EngineBlockBundle\Doctrine\Type\SerializedObjectType
+
     orm:
         auto_generate_proxy_classes: "%kernel.debug%"
         proxy_dir: '%kernel.cache_dir%/doctrine/orm/Proxies'

config/packages/doctrine.yaml

@@ -2,6 +2,12 @@ services:
     _defaults:
         public: true
 
+    OpenConext\EngineBlockBundle\Bridge\EngineBlockBootstrapper:
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: kernel.event_subscriber }
+
     OpenConext\EngineBlock\Xml\:
         resource: '../../src/OpenConext/EngineBlock/Xml'
         exclude: '../../src/OpenConext/EngineBlock/Xml/ValueObjects'

config/services/services.yml

@@ -30,8 +30,12 @@
 use OpenConext\EngineBlockBundle\Sbs\SbsClientInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface as SymfonyContainerInterface;
 use Symfony\Component\Mailer\MailerInterface;
-use Twig\Environment;
 
+/**
+ * This DiContainer relies on fetching services from the Symfony service container. This is no longer the way to go.
+ * Instead, going forward, inject new dependencies into \OpenConext\EngineBlockBundle\Bridge\DiContainerRuntime
+ * This way we no longer need to worry about Symfony purging services and Symfony can properly optimize it's service container.
+ */
 class EngineBlock_Application_DiContainer extends \Pimple\Container
 {
     const ATTRIBUTE_METADATA                    = 'attributeMetadata';
@@ -417,14 +421,6 @@ public function getEncryptionKeysConfiguration()
         return $this->container->getParameter('encryption_keys');
     }
 
-    /**
-     * @return Environment
-     */
-    public function getTwigEnvironment()
-    {
-        return $this->container->get('twig');
-    }
-
     /**
      * @return array
      */

library/EngineBlock/Application/DiContainer.php

@@ -17,12 +17,11 @@
  */
 
 use OpenConext\EngineBlock\Logger\Handler\FingersCrossed\ManualOrDecoratedActivationStrategy;
-use OpenConext\EngineBlock\Metadata\Entity\IdentityProvider;
 use OpenConext\EngineBlock\Metadata\MetadataRepository\EntityNotFoundException;
 use OpenConext\EngineBlock\Request\RequestId;
+use OpenConext\EngineBlockBundle\Bridge\DiContainerRuntime;
 use OpenConext\EngineBlockBundle\Exception\Art;
 use Psr\Log\LoggerInterface;
-use SAML2\XML\saml\Issuer;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 define('ENGINEBLOCK_FOLDER_ROOT'       , realpath(__DIR__ . '/../../') . '/');
@@ -80,6 +79,8 @@ class EngineBlock_ApplicationSingleton
      */
     protected $_diContainer;
 
+    protected ?DiContainerRuntime $_diContainerRuntime = null;
+
     /**
      * @var ManualOrDecoratedActivationStrategy
      */
@@ -109,6 +110,20 @@ public static function getInstance()
         return self::$s_instance;
     }
 
+    public function setDiContainerRuntime(DiContainerRuntime $diContainerRuntime): void
+    {
+        $this->_diContainerRuntime = $diContainerRuntime;
+    }
+
+    public function getDiContainerRuntime(): DiContainerRuntime
+    {
+        if ($this->_diContainerRuntime === null) {
+            throw new RuntimeException('The DiContainerRuntime is not ready yet!');
+        }
+
+        return $this->_diContainerRuntime;
+    }
+
     /**
      * Get THE Log instance.
      *

library/EngineBlock/ApplicationSingleton.php

@@ -439,7 +439,7 @@ protected function _processProxyServerResponseBody(EngineBlock_Http_Response $re
 
     protected function _getCoreProxy()
     {
-        $twig = EngineBlock_ApplicationSingleton::getInstance()->getDiContainer()->getTwigEnvironment();
+        $twig = EngineBlock_ApplicationSingleton::getInstance()->getDiContainerRuntime()->twig;
         return new EngineBlock_Corto_ProxyServer($twig);
     }
 

library/EngineBlock/Corto/Adapter.php

@@ -116,7 +116,7 @@ public function __construct(EngineBlock_Corto_ProxyServer $server)
         $diContainer                       = EngineBlock_ApplicationSingleton::getInstance()->getDiContainer();
         $this->_featureConfiguration = $diContainer->getFeatureConfiguration();
         $this->_logger = EngineBlock_ApplicationSingleton::getLog();
-        $this->twig = $diContainer->getTwigEnvironment();
+        $this->twig = EngineBlock_ApplicationSingleton::getInstance()->getDiContainerRuntime()->twig;
         $this->acsLocationSchemeValidator = $diContainer->getAcsLocationSchemeValidator();
         $this->stepupIdentityProvider = $diContainer->getStepupIdentityProvider($this->_server);
     }

library/EngineBlock/Corto/Module/Bindings.php

@@ -75,6 +75,7 @@ public function serve($serviceName)
     private function factoryService($className, EngineBlock_Corto_ProxyServer $server)
     {
         $diContainer = EngineBlock_ApplicationSingleton::getInstance()->getDiContainer();
+        $diContainerRuntime = EngineBlock_ApplicationSingleton::getInstance()->getDiContainerRuntime();
 
         switch($className) {
             case EngineBlock_Corto_Module_Service_ProvideConsent::class :
@@ -84,7 +85,7 @@ private function factoryService($className, EngineBlock_Corto_ProxyServer $serve
                     $diContainer->getConsentFactory(),
                     $diContainer->getConsentService(),
                     $diContainer->getAuthenticationStateHelper(),
-                    $diContainer->getTwigEnvironment(),
+                    $diContainerRuntime->twig,
                     $diContainer->getProcessingStateHelper(),
                     $diContainer->getDiscoverySelectionService()
                 );
@@ -128,19 +129,19 @@ private function factoryService($className, EngineBlock_Corto_ProxyServer $serve
                 return new EngineBlock_Corto_Module_Service_SingleSignOn(
                     $server,
                     $diContainer->getXmlConverter(),
-                    $diContainer->getTwigEnvironment(),
+                    $diContainerRuntime->twig,
                     $diContainer->getServiceProviderFactory(),
                     $diContainer->getDiscoverySelectionService()
                 );
             case EngineBlock_Corto_Module_Service_ContinueToIdp::class :
                 return new EngineBlock_Corto_Module_Service_ContinueToIdp(
                     $server,
                     $diContainer->getXmlConverter(),
-                    $diContainer->getTwigEnvironment(),
+                    $diContainerRuntime->twig,
                     $diContainer->getServiceProviderFactory()
                 );
             default :
-                return new $className($server, $diContainer->getXmlConverter(), $diContainer->getTwigEnvironment());
+                return new $className($server, $diContainer->getXmlConverter(), $diContainerRuntime->twig);
         }
     }
 }

library/EngineBlock/Corto/Module/Services.php

@@ -18,7 +18,6 @@
 
 namespace OpenConext\EngineBlock\Metadata\Entity;
 
-use DateTime;
 use Doctrine\ORM\Mapping as ORM;
 use OpenConext\EngineBlock\Metadata\Coins;
 use OpenConext\EngineBlock\Metadata\ContactPerson;
@@ -28,12 +27,17 @@
 use OpenConext\EngineBlock\Metadata\Organization;
 use OpenConext\EngineBlock\Metadata\Service;
 use OpenConext\EngineBlock\Metadata\X509\X509Certificate;
+use OpenConext\EngineBlockBundle\Doctrine\Type\SerializedArrayType;
+use OpenConext\EngineBlockBundle\Doctrine\Type\SerializedObjectType;
 use RuntimeException;
 use SAML2\Constants;
 
 /**
  * Abstract base class for configuration entities.
  *
+ * Note: This baseclass is extended by IdentityProvider and ServiceProvider. Both entities are stored in a single table.
+ * This means all columns defined in both subclasses are nullable by default, even if you pass 'nullable: false'.
+ *
  * @package OpenConext\EngineBlock\Metadata\Entity
  * @SuppressWarnings(PHPMD.TooManyFields)
  *
@@ -134,25 +138,25 @@ abstract class AbstractRole
      * @var Logo
      * @deprecated Will be removed in favour of using the Mdui value object, use the getter for this field instead
      */
-    #[ORM\Column(name: 'logo', type: \Doctrine\DBAL\Types\Types::OBJECT)]
+    #[ORM\Column(name: 'logo', type: SerializedObjectType::NAME)]
     public $logo;
 
     /**
      * @var Organization
      */
-    #[ORM\Column(name: 'organization_nl_name', type: \Doctrine\DBAL\Types\Types::OBJECT, nullable: true, length: 65535)]
+    #[ORM\Column(name: 'organization_nl_name', type: SerializedObjectType::NAME, length: 65535, nullable: true)]
     public $organizationNl;
 
     /**
      * @var Organization
      */
-    #[ORM\Column(name: 'organization_en_name', type: \Doctrine\DBAL\Types\Types::OBJECT, nullable: true, length: 65535)]
+    #[ORM\Column(name: 'organization_en_name', type: SerializedObjectType::NAME, length: 65535, nullable: true)]
     public $organizationEn;
 
     /**
      * @var Organization
      */
-    #[ORM\Column(name: 'organization_pt_name', type: \Doctrine\DBAL\Types\Types::OBJECT, nullable: true, length: 65535)]
+    #[ORM\Column(name: 'organization_pt_name', type: SerializedObjectType::NAME, length: 65535, nullable: true)]
     public $organizationPt;
 
     /**
@@ -179,7 +183,7 @@ abstract class AbstractRole
     /**
      * @var X509Certificate[]
      */
-    #[ORM\Column(name: 'certificates', type: \Doctrine\DBAL\Types\Types::ARRAY, length: 65535)]
+    #[ORM\Column(name: 'certificates', type: SerializedArrayType::NAME, length: 65535)]
     public $certificates = array();
 
     /**
@@ -191,7 +195,7 @@ abstract class AbstractRole
     /**
      * @var ContactPerson[]
      */
-    #[ORM\Column(name: 'contact_persons', type: \Doctrine\DBAL\Types\Types::ARRAY, length: 65535)]
+    #[ORM\Column(name: 'contact_persons', type: SerializedArrayType::NAME, length: 65535)]
     public $contactPersons;
 
     /**
@@ -203,13 +207,13 @@ abstract class AbstractRole
     /**
      * @var string[]
      */
-    #[ORM\Column(name: 'name_id_formats', type: \Doctrine\DBAL\Types\Types::ARRAY, length: 65535)]
+    #[ORM\Column(name: 'name_id_formats', type: SerializedArrayType::NAME, length: 65535)]
     public $supportedNameIdFormats;
 
     /**
      * @var Service
      */
-    #[ORM\Column(name: 'single_logout_service', type: \Doctrine\DBAL\Types\Types::OBJECT, nullable: true, length: 65535)]
+    #[ORM\Column(name: 'single_logout_service', type: SerializedObjectType::NAME, length: 65535, nullable: true)]
     public $singleLogoutService;
 
     /**