From ddb88c726d4d87021459d481c422914e20cfd0e9 Mon Sep 17 00:00:00 2001 From: Deltik Date: Fri, 29 Mar 2019 10:14:27 -0500 Subject: [PATCH] Moved off of deprecated Twig classes --- e107 | 2 +- lib/cpaneluapi | 2 +- tests/_support/Helper/E107Base.php | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/e107 b/e107 index a8d1541b9..c060d5ace 160000 --- a/e107 +++ b/e107 @@ -1 +1 @@ -Subproject commit a8d1541b9d059437d7a98cf1c3b652b879ebb7ca +Subproject commit c060d5ace25abd5dd1cc701937c6aedb0078a058 diff --git a/lib/cpaneluapi b/lib/cpaneluapi index c7868a07e..f1c73d690 160000 --- a/lib/cpaneluapi +++ b/lib/cpaneluapi @@ -1 +1 @@ -Subproject commit c7868a07e4d9fef5878d988501c05ee808b11e51 +Subproject commit f1c73d69027b8d6b2bf3aa1c3d66ab51e693ce11 diff --git a/tests/_support/Helper/E107Base.php b/tests/_support/Helper/E107Base.php index 45b4648e9..3db26f372 100644 --- a/tests/_support/Helper/E107Base.php +++ b/tests/_support/Helper/E107Base.php @@ -6,6 +6,9 @@ include_once(codecept_root_dir() . "lib/preparers/PreparerFactory.php"); // all public methods declared in helper class will be available in $I use Codeception\Lib\ModuleContainer; +use PreparerFactory; +use Twig\Environment; +use Twig\Loader\ArrayLoader; abstract class E107Base extends Base { @@ -16,7 +19,7 @@ abstract class E107Base extends Base public function __construct(ModuleContainer $moduleContainer, $config = null) { parent::__construct($moduleContainer, $config); - $this->preparer = \PreparerFactory::create(); + $this->preparer = PreparerFactory::create(); } public function _beforeSuite($settings = array()) @@ -37,10 +40,10 @@ abstract class E107Base extends Base protected function writeLocalE107Config() { - $twig_loader = new \Twig_Loader_Array([ + $twig_loader = new ArrayLoader([ 'e107_config.php' => file_get_contents(codecept_data_dir()."/e107_config.php.sample") ]); - $twig = new \Twig_Environment($twig_loader); + $twig = new Environment($twig_loader); $db = $this->getModule('\Helper\DelayedDb');