backport container aware

Author: dbu

CHANGELOG.md

@@ -1,10 +1,21 @@
 CHANGELOG
 =========
 
+1.x
+===
+
+1.6.0
+-----
+
+* Deprecate using `Symfony\Component\DependencyInjection\ContainerAwareInterface` in favor of
+  `PHPCR\PhpcrMigrationsBundle\ContainerAwareInterface` as Symfony 7 dropped its
+  ContainerAwareInterface.
+  On Symfony 6, the legacy ContainerAwareInterface continues to e supported.
+
 1.5.0
 -----
 
-* Allow installation with Symfony 7
+* Allow installation with Symfony 7 (! broken if you use `Symfony\Component\DependencyInjection\ContainerAwareInterface`)
 * Drop support for PHP < 8.1 and modernize code
 
 1.4.0

composer.json

@@ -24,11 +24,12 @@
     },
     "require-dev": {
         "doctrine/doctrine-bundle": "^1.8 || ^2.0",
-        "doctrine/phpcr-odm": "^1.4 || ^2.0",
+        "doctrine/phpcr-odm": "^1.4",
         "symfony/monolog-bundle": "^3.0",
         "symfony/phpunit-bridge": "^7.0",
         "symfony/symfony": "^5.4 || ^6.0 || ^7.0",
-        "symfony-cmf/testing": "^2.1 || ^3.0 || ^4.0"
+        "symfony-cmf/testing": "^2.1 || ^3.0 || ^4.0",
+        "doctrine/annotations": "^2.0"
     },
     "autoload": {
         "psr-4": {

src/Command/MigrateCommand.php

@@ -12,11 +12,12 @@
 namespace PHPCR\PhpcrMigrationsBundle\Command;
 
 use PHPCR\Migrations\MigratorFactory;
+use PHPCR\PhpcrMigrationsBundle\ContainerAwareInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface as SymfonyContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 class MigrateCommand extends Command
@@ -77,6 +78,9 @@ public function execute(InputInterface $input, OutputInterface $output): int
         foreach ($migrator->getVersions() as $version) {
             if ($version instanceof ContainerAwareInterface) {
                 $version->setContainer($this->container);
+            } elseif ($version instanceof SymfonyContainerAwareInterface) {
+                $version->setContainer($this->container);
+                @trigger_error('Relying on '.SymfonyContainerAwareInterface::class.' is deprecated and will break when upgrading to Symfony 7. Use '.ContainerAwareInterface::class.' instead.', \E_USER_DEPRECATED);
             }
         }
 

src/ContainerAwareInterface.php

@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the PHPCR Migrations package
+ *
+ * (c) Daniel Leech <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace PHPCR\PhpcrMigrationsBundle;
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Interface for migrations to get the Symfony container injected.
+ */
+interface ContainerAwareInterface
+{
+    public function setContainer(?ContainerInterface $container = null): void;
+}

tests/Resources/Bundle/TwoTestBundle/Resources/phpcr-migrations/Version201401011300.php

@@ -10,15 +10,15 @@
  */
 
 use PHPCR\Migrations\VersionInterface;
+use PHPCR\PhpcrMigrationsBundle\ContainerAwareInterface;
 use PHPCR\SessionInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 class Version201401011300 implements VersionInterface, ContainerAwareInterface
 {
     private $container;
 
-    public function setContainer(?ContainerInterface $container = null)
+    public function setContainer(?ContainerInterface $container = null): void
     {
         $this->container = $container;
     }