moved ContainerAwareInterface, ContainerAwareTrait in pp (#13)

Co-authored-by: Yury Bushenko <yury.bushenko@dalee.ru>
Dalee · Jun 18, 2024 · 5725bdb · 5725bdb
1 parent bee3f83
commit 5725bdb
Show file tree

Hide file tree

Showing 19 changed files with 71 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change log
 
+## [3.0.8] 2024-06-18
+- Перенесены устаревшие ContainerAwareTrait и ContainerAwareInterface из Symfony\DependencyInjection
+
 ## [3.0.7] 2024-03-27
 - Исправлены предупреждения в модуле ACL в сортировке правил
 

diff --git a/cronruns/queue.cronrun.inc b/cronruns/queue.cronrun.inc
@@ -2,7 +2,7 @@
 
 use PP\Lib\PersistentQueue;
 use PP\Cron\AbstractCron;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use PP\DependencyInjection\ContainerAwareInterface;
 
 /**
  * Class PXCronRunQueue

diff --git a/lib/Engine/action.class.inc b/lib/Engine/action.class.inc
@@ -1,7 +1,7 @@
 <?php
 
 use PP\Lib\Http\Response;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use PP\DependencyInjection\ContainerAwareInterface;
 use PP\Lib\Engine\AbstractEngine;
 
 class PXEngineAction extends AbstractEngine

diff --git a/lib/Engine/index.class.inc b/lib/Engine/index.class.inc
@@ -1,7 +1,7 @@
 <?php
 
 use PP\Lib\Http\Response;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use PP\DependencyInjection\ContainerAwareInterface;
 use PP\Lib\Engine\AbstractEngine;
 
 class PXEngineIndex extends AbstractEngine

diff --git a/lib/Engine/json.class.inc b/lib/Engine/json.class.inc
@@ -1,7 +1,7 @@
 <?php
 
 use PP\Lib\Http\Response;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use PP\DependencyInjection\ContainerAwareInterface;
 use PP\Lib\Engine\AbstractEngine;
 use PP\Module\AbstractModule;
 

diff --git a/lib/common.version.inc b/lib/common.version.inc
@@ -1,3 +1,3 @@
 <?php
 
-define('PP_VERSION', 'v3.0.7');
+define('PP_VERSION', 'v3.0.8');
diff --git a/src/Command/CronCommand.php b/src/Command/CronCommand.php
@@ -3,7 +3,7 @@
 namespace PP\Command;
 
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use PP\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;

diff --git a/src/ConsoleApplication.php b/src/ConsoleApplication.php
@@ -18,7 +18,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\Yaml\Yaml;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use PP\DependencyInjection\ContainerAwareTrait;
 
 use PP\Command\GetPropertyCommand;
 use PP\Lib\Command\AbstractCommand;

diff --git a/src/Cron/AbstractCron.php b/src/Cron/AbstractCron.php
@@ -3,8 +3,8 @@
 namespace PP\Cron;
 
 use PP\Lib\Datastruct\Tree;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use PP\DependencyInjection\ContainerAwareInterface;
+use PP\DependencyInjection\ContainerAwareTrait;
 use PP\Lib\Database\Driver\PostgreSqlDriver;
 
 /**

diff --git a/src/DependencyInjection/ContainerAwareInterface.php b/src/DependencyInjection/ContainerAwareInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace PP\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * ContainerAwareInterface should be implemented by classes that depends on a Container.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+interface ContainerAwareInterface
+{
+	/**
+	 * @param ContainerInterface|null $container
+	 * @return void
+	 */
+    public function setContainer(?ContainerInterface $container);
+}
diff --git a/src/DependencyInjection/ContainerAwareTrait.php b/src/DependencyInjection/ContainerAwareTrait.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace PP\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * ContainerAware trait.
+ * @author Fabien Potencier <fabien@symfony.com>
+ */
+trait ContainerAwareTrait
+{
+    /**
+     * @var ContainerInterface|null
+     */
+    protected $container;
+
+
+    /**
+     * @param ContainerInterface|null $container
+     * @return void
+     */
+    public function setContainer(?ContainerInterface $container = null): void
+    {
+        if (1 > \func_num_args()) {
+            trigger_deprecation('symfony/dependency-injection', '6.2', 'Calling "%s::%s()" without any arguments is deprecated, pass null explicitly instead.', __CLASS__, __FUNCTION__);
+        }
+
+        $this->container = $container;
+    }
+}
diff --git a/src/Lib/Command/AbstractCommand.php b/src/Lib/Command/AbstractCommand.php
@@ -2,8 +2,8 @@
 
 namespace PP\Lib\Command;
 
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use PP\DependencyInjection\ContainerAwareInterface;
+use PP\DependencyInjection\ContainerAwareTrait;
 use PP\Lib\Database\Driver\PostgreSqlDriver;
 
 /**

diff --git a/src/Lib/Engine/Admin/AdminEngineAction.php b/src/Lib/Engine/Admin/AdminEngineAction.php
@@ -3,7 +3,7 @@
 namespace PP\Lib\Engine\Admin;
 
 use PP\Lib\Http\Response;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use PP\DependencyInjection\ContainerAwareInterface;
 
 /**
  * Class AdminEngineAction.

diff --git a/src/Lib/Engine/Admin/AdminEngineIndex.php b/src/Lib/Engine/Admin/AdminEngineIndex.php
@@ -3,7 +3,7 @@
 namespace PP\Lib\Engine\Admin;
 
 use PP\Lib\Http\Response;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use PP\DependencyInjection\ContainerAwareInterface;
 use PXModuleDescription;
 use PP\Lib\Html\Layout\AdminHtmlLayout;
 

diff --git a/src/Lib/Engine/Admin/AdminEngineJson.php b/src/Lib/Engine/Admin/AdminEngineJson.php
@@ -3,7 +3,7 @@
 namespace PP\Lib\Engine\Admin;
 
 use PP\Lib\Http\Response;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use PP\DependencyInjection\ContainerAwareInterface;
 
 /**
  * Class AdminEngineJson.

diff --git a/src/Lib/Engine/Admin/AdminEnginePopup.php b/src/Lib/Engine/Admin/AdminEnginePopup.php
@@ -2,7 +2,7 @@
 
 namespace PP\Lib\Engine\Admin;
 
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use PP\DependencyInjection\ContainerAwareInterface;
 
 /**
  * Class AdminEnginePopup.

diff --git a/src/Module/AbstractModule.php b/src/Module/AbstractModule.php
@@ -2,7 +2,7 @@
 
 namespace PP\Module;
 
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+use PP\DependencyInjection\ContainerAwareTrait;
 
 /**
  * Class AbstractModule.

diff --git a/src/Module/CronRunModule.php b/src/Module/CronRunModule.php
@@ -3,7 +3,7 @@
 namespace PP\Module;
 
 use PP\Cron\AbstractCron;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use PP\DependencyInjection\ContainerAwareInterface;
 use PP\Lib\Datastruct\Tree;
 use PP\Cron\CronRule;
 use PXRegistry;

diff --git a/src/Module/ModuleInterface.php b/src/Module/ModuleInterface.php
@@ -2,7 +2,7 @@
 
 namespace PP\Module;
 
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use PP\DependencyInjection\ContainerAwareInterface;
 
 /**
  * Interface ModuleInterface.