Fix deprecations

Author: Marc Reimann

composer.json

@@ -92,7 +92,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-release/2.4.0": "2.4.x-dev"
+      "dev-feature/symfony-7": "2.5.x-dev"
     },
     "contao-manager-plugin": "ContaoCommunityAlliance\\DcGeneral\\ContaoManager\\Plugin"
   }

src/Cache/Http/InvalidateCacheTags.php

@@ -70,12 +70,12 @@ class InvalidateCacheTags implements InvalidateCacheTagsInterface
      *
      * @param string                   $namespace    The http cache namespace.
      * @param EventDispatcherInterface $dispatcher   The event dispatcher.
-     * @param CacheInvalidator|null    $cacheManager The http cache manager.
+     * @param CacheInvalidator|null $cacheManager The http cache manager.
      */
     public function __construct(
         string $namespace,
         EventDispatcherInterface $dispatcher,
-        CacheInvalidator $cacheManager = null
+        ?CacheInvalidator $cacheManager = null
     ) {
         $this->namespace    = $namespace;
         $this->dispatcher   = $dispatcher;

src/Contao/Compatibility/DcCompat.php

@@ -58,10 +58,10 @@ class DcCompat extends General
      * Create a new instance.
      *
      * @param EnvironmentInterface $environment  The Dc instance to use for delegating.
-     * @param ModelInterface|null  $model        The model within scope (optional).
+     * @param ModelInterface|null $model        The model within scope (optional).
      * @param string|null          $propertyName The name of the property within scope (optional).
      */
-    public function __construct(EnvironmentInterface $environment, ModelInterface $model = null, $propertyName = null)
+    public function __construct(EnvironmentInterface $environment, ?ModelInterface $model = null, $propertyName = null)
     {
         // Prevent "Recoverable error: Argument X passed to SomClass::someMethod() must be an instance of DataContainer,
         // instance of ContaoCommunityAlliance\DcGeneral\Contao\Compatibility\DcCompat given" in callbacks.

src/Contao/Dca/Builder/Legacy/LegacyDcaDataDefinitionBuilder.php

@@ -763,6 +763,10 @@ protected function parseBackendView(ContainerInterface $container)
         $this->parsePanel($view);
         $this->parseGlobalOperations($view);
         $this->parseModelOperations($view);
+
+        // Contao 5.7 handling.
+        // $builder = \Contao\System::getContainer()->get('contao.data_container.operations_builder');
+        // $operationDca = $builder->initializeWithButtons($container->getName(), [], );
     }
 
     /**
@@ -1203,6 +1207,10 @@ protected function parseModelOperations(Contao2BackendViewDefinitionInterface $v
         $collection = $view->getModelCommands();
 
         foreach ($operationsDca as $operationName => $operationDca) {
+            if (is_string($operationDca)) {
+                continue;
+            }
+            assert(is_array($operationDca));
             $command = $this->createCommand($operationName, $operationDca);
             $collection->addCommand($command);
         }

src/Contao/Picker/AbstractAwarePickerProvider.php

@@ -156,7 +156,7 @@ protected function getUser()
      *
      * @return array
      */
-    abstract protected function getRouteParameters(PickerConfig $config = null);
+    abstract protected function getRouteParameters(?PickerConfig $config = null);
 
     /**
      * Generates the URL for the picker.

src/Contao/Picker/PagePickerProvider.php

@@ -108,7 +108,7 @@ public function supportsValue(PickerConfig $config): bool
     /**
      * {@inheritdoc}
      */
-    public function getDcaTable(PickerConfig $config = null): string
+    public function getDcaTable(?PickerConfig $config = null): string
     {
         return 'tl_page';
     }

src/Contao/Picker/TreePickerProvider.php

@@ -110,7 +110,7 @@ public function convertDcaValue(PickerConfig $config, mixed $value): int|string
     /**
      * {@inheritdoc}
      */
-    protected function getRouteParameters(PickerConfig $config = null)
+    protected function getRouteParameters(?PickerConfig $config = null)
     {
         return ['do' => 'tree'];
     }

src/Contao/Subscriber/FormatModelLabelSubscriber.php

@@ -110,7 +110,7 @@ public function handleFormatModelLabel(FormatModelLabelEvent $event)
      *
      * @return string
      */
-    private function getFirstSorting(GroupAndSortingDefinitionInterface $sortingDefinition = null)
+    private function getFirstSorting(?GroupAndSortingDefinitionInterface $sortingDefinition = null)
     {
         if (null === $sortingDefinition) {
             return '';

src/Contao/View/Contao2BackendView/ActionHandler/MultipleHandler/OverrideAllHandler.php

@@ -147,7 +147,7 @@ private function process(Action $action, EnvironmentInterface $environment)
      * Handle invalid property value bag.
      *
      * @param PropertyValueBagInterface|null $propertyValueBag The property value bag.
-     * @param ModelInterface|null            $model            The model.
+     * @param ModelInterface|null $model            The model.
      * @param EnvironmentInterface           $environment      The environment.
      *
      * @return void
@@ -157,9 +157,9 @@ private function process(Action $action, EnvironmentInterface $environment)
      * @SuppressWarnings(PHPMD.LongVariable)
      */
     protected function handleInvalidPropertyValueBag(
-        PropertyValueBagInterface $propertyValueBag = null,
-        ModelInterface $model = null,
-        EnvironmentInterface $environment
+        ?PropertyValueBagInterface $propertyValueBag = null,
+        ?ModelInterface            $model = null,
+        EnvironmentInterface       $environment
     ) {
         // @codingStandardsIgnoreStart
         @\trigger_error('This function where remove in 3.0. ' . __CLASS__  . '::' . __FUNCTION__, E_USER_DEPRECATED);
@@ -210,16 +210,16 @@ protected function handleInvalidPropertyValueBag(
      *
      * @param Action                    $action            The action.
      * @param \ArrayObject              $renderInformation The render information.
-     * @param PropertyValueBagInterface $propertyValues    The property values.
+     * @param PropertyValueBagInterface|null $propertyValues    The property values.
      * @param EnvironmentInterface      $environment       The environment.
      *
      * @return void
      */
     private function handleOverrideCollection(
-        Action $action,
-        \ArrayObject $renderInformation,
-        PropertyValueBagInterface $propertyValues = null,
-        EnvironmentInterface $environment
+        Action                     $action,
+        \ArrayObject               $renderInformation,
+        ?PropertyValueBagInterface $propertyValues = null,
+        EnvironmentInterface       $environment
     ) {
         if (!$propertyValues) {
             return;

src/Contao/View/Contao2BackendView/ActionHandler/ToggleHandler.php

@@ -101,7 +101,7 @@ public function handleEvent(ActionEvent $event)
      *
      * @param EnvironmentInterface   $environment The environment.
      * @param ToggleCommandInterface $operation   The operation.
-     * @param ModelIdInterface|null  $modelId     The model id.
+     * @param ModelIdInterface|null $modelId     The model id.
      *
      * @return void
      *
@@ -112,7 +112,7 @@ public function handleEvent(ActionEvent $event)
     protected function process(
         EnvironmentInterface $environment,
         ToggleCommandInterface $operation,
-        ModelIdInterface $modelId = null
+        ?ModelIdInterface $modelId = null
     ) {
         $dataProvider = $environment->getDataProvider();
         assert($dataProvider instanceof DataProviderInterface);