Merge pull request #8 from dayspring-tech/hotfix/fix-debug-import

Fix Debug import for Symfony 5.4

Author: jwong-dayspring

.github/workflows/symfony.yml

@@ -11,7 +11,6 @@ jobs:
       fail-fast: false
       matrix:
         php:
-          - '7.3'
           - '7.4'
           - '8.0'
           - '8.1'

Bootstrap/service.php

@@ -5,7 +5,7 @@
 use Bref\Runtime\LambdaRuntime;
 use Dayspring\LambdaBundle\Service\LambdaHandlerServiceInterface;
 use Symfony\Component\Console\Output\BufferedOutput;
-use Symfony\Component\Debug\Debug;
+use Symfony\Component\ErrorHandler\Debug;
 use Symfony\Component\Dotenv\Dotenv;
 
 // memory to save for system overhead (in MB)
@@ -51,7 +51,8 @@
 /** @var LambdaHandlerServiceInterface $service */
 $service = null;
 try {
-    $kernel = new AppKernel($env, $debug);
+    $kernelClass = getenv('KERNEL_CLASS') ?: 'AppKernel';
+    $kernel = new $kernelClass($env, $debug);
     $kernel->boot();
 
     $service = $kernel->getContainer()->get($handlerService);

DependencyInjection/Configuration.php

@@ -15,10 +15,9 @@ class Configuration implements ConfigurationInterface
     /**
      * {@inheritdoc}
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('dayspring_lambda');
+        $treeBuilder = new TreeBuilder('dayspring_lambda');
 
         // Here you should define the parameters that are allowed to
         // configure your bundle. See the documentation linked above for

DependencyInjection/DayspringLambdaExtension.php

@@ -2,6 +2,7 @@
 
 namespace Dayspring\LambdaBundle\DependencyInjection;
 
+use Exception;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
@@ -16,8 +17,9 @@ class DayspringLambdaExtension extends Extension
 {
     /**
      * {@inheritdoc}
+     * @throws Exception
      */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);

Service/EchoLambdaHandlerService.php

@@ -10,7 +10,7 @@ class EchoLambdaHandlerService implements LambdaHandlerServiceInterface
 {
 
     /** @var LoggerInterface $logger */
-    protected $logger;
+    protected LoggerInterface $logger;
 
     /**
      * @param LoggerInterface $logger

Service/ServiceFunctionHandlerService.php

@@ -3,23 +3,18 @@
 namespace Dayspring\LambdaBundle\Service;
 
 use Bref\Context\Context;
-use Dayspring\LambdaBundle\Service\LambdaHandlerServiceInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use function json_decode;
-use function json_encode;
-use function var_dump;
-use function var_export;
 
 class ServiceFunctionHandlerService implements LambdaHandlerServiceInterface
 {
 
     /** @var LoggerInterface $logger */
-    protected $logger;
+    protected LoggerInterface $logger;
 
     /** @var ContainerInterface $container */
-    protected $container;
+    protected ContainerInterface $container;
 
 
     /**

Service/SqsLambdaHandlerService.php

@@ -10,7 +10,7 @@ class SqsLambdaHandlerService implements LambdaHandlerServiceInterface
 {
 
     /** @var LoggerInterface $logger */
-    protected $logger;
+    protected LoggerInterface $logger;
 
     /**
      * @param LoggerInterface $logger

Service/SqsServiceFunctionHandlerService.php

@@ -3,39 +3,10 @@
 namespace Dayspring\LambdaBundle\Service;
 
 use Bref\Context\Context;
-use Dayspring\LambdaBundle\Service\LambdaHandlerServiceInterface;
-use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use function is_a;
-use function is_array;
-use function json_decode;
-use function json_encode;
-use function var_dump;
-use function var_export;
 
 class SqsServiceFunctionHandlerService extends ServiceFunctionHandlerService
 {
-
-    /** @var LoggerInterface $logger */
-    protected $logger;
-
-    /** @var ContainerInterface $container */
-    protected $container;
-
-
-    /**
-     * @param LoggerInterface $logger
-     * @param ContainerInterface $container
-     */
-    public function __construct(
-        LoggerInterface $logger,
-        ContainerInterface $container
-    ) {
-        $this->logger = $logger;
-        $this->container = $container;
-    }
-
     public function init()
     {
         // nothing to init

Tests/Service/EchoLambdaHandlerServiceTest.php

@@ -2,23 +2,28 @@
 
 namespace Dayspring\LambdaBundle\Tests\Service;
 
-class EchoLambdaHandlerServiceTest extends \PHPUnit\Framework\TestCase
+use Bref\Context\Context;
+use Dayspring\LambdaBundle\Service\EchoLambdaHandlerService;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Console\Output\BufferedOutput;
+
+class EchoLambdaHandlerServiceTest extends TestCase
 {
 
     public function testHandle()
     {
-        $logger = $this->createMock(\Psr\Log\LoggerInterface::class);
+        $logger = $this->createMock(LoggerInterface::class);
 
-        /** @var \Dayspring\LambdaBundle\Service\EchoLambdaHandlerService $service */
-        $service = new \Dayspring\LambdaBundle\Service\EchoLambdaHandlerService($logger);
+        $service = new EchoLambdaHandlerService($logger);
 
-        $context = new \Bref\Context\Context(
+        $context = new Context(
             'request-id-1',
             30*1000,
             'my-function-arn',
             'trace-id-1'
         );
-        $output = new \Symfony\Component\Console\Output\BufferedOutput();
+        $output = new BufferedOutput();
 
         $event = [
             'body' => 'hello world'

composer.json

@@ -21,10 +21,12 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "symfony/framework-bundle": "^3.4.31|^4.0|^5.0",
+        "php": ">=7.4",
+        "ext-json": "*",
+        "symfony/dotenv": "^4.4|^5.0",
+        "symfony/framework-bundle": "^4.4|^5.0",
+        "symfony/yaml": "^4.4|^5.0",
         "sensio/framework-extra-bundle": "^5.0.1",
-        "symfony/yaml": "^3.4.31|^4.0|^5.0",
         "bref/bref": "^1.7"
     },
     "require-dev": {