Updates symfony example for symfony-demo 1.5 (GoogleCloudPlatform#1033)

Author: bshaffer

appengine/php72/symfony-framework/src/EventSubscriber/ExceptionSubscriber.php

@@ -22,7 +22,7 @@
 
 use Google\Cloud\ErrorReporting\Bootstrap;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
+use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
@@ -40,9 +40,9 @@ public static function getSubscribedEvents()
         ]];
     }
 
-    public function logException(GetResponseForExceptionEvent $event)
+    public function logException(ExceptionEvent $event)
     {
-        $exception = $event->getException();
+        $exception = $event->getThrowable();
         Bootstrap::init();
         Bootstrap::exceptionHandler($exception);
     }

appengine/php72/symfony-framework/test/DeployDoctrineTest.php

@@ -17,14 +17,12 @@
 
 namespace Google\Cloud\Samples\AppEngine\Symfony;
 
-use Google\Cloud\TestUtils\TestTrait;
 use PHPUnit\Framework\TestCase;
 
 require_once __DIR__ . '/DeploySymfonyTrait.php';
 
 class DeployDoctrineTest extends TestCase
 {
-    use TestTrait;
     use DeploySymfonyTrait;
 
     public static function beforeDeploy()

appengine/php72/symfony-framework/test/DeploySymfonyTrait.php

@@ -20,12 +20,6 @@
 use Google\Cloud\TestUtils\AppEngineDeploymentTrait;
 use Google\Cloud\TestUtils\ExecuteCommandTrait;
 use Google\Cloud\TestUtils\FileUtil;
-use PhpParser\PrettyPrinter;
-use PhpParser\ParserFactory;
-use PhpParser\Node;
-use PhpParser\Node\Stmt\ClassMethod;
-use PhpParser\NodeTraverser;
-use PhpParser\NodeVisitorAbstract;
 
 trait DeploySymfonyTrait
 {
@@ -35,15 +29,15 @@ trait DeploySymfonyTrait
     private static function createSymfonyProject()
     {
         $tmpDir = sys_get_temp_dir() . '/test-' . FileUtil::randomName(8);
-        self::setWorkingDirectory($tmpDir);
-
 
         // install
-        $demoVersion = 'symfony/symfony-demo:^1.2';
+        $demoVersion = 'symfony/symfony-demo:^1.5';
         $cmd = sprintf('composer create-project %s %s || true', $demoVersion, $tmpDir);
         $process = self::createProcess($cmd);
         $process->setTimeout(300); // 5 minutes
+
         self::executeProcess($process);
+        self::setWorkingDirectory($tmpDir);
 
         // move app.yaml for the sample to the new symfony installation
         self::copyFiles(['app.yaml'], $tmpDir);
@@ -64,35 +58,43 @@ private static function createSymfonyProject()
     private static function updateKernelCacheAndLogDir($projectDir)
     {
         $kernelFile = $projectDir . '/src/Kernel.php';
-        $parser = (new ParserFactory)->create(ParserFactory::ONLY_PHP7);
-        $ast = $parser->parse(file_get_contents($kernelFile));
-        $newStmts = $parser->parse(<<<'CODE'
-<?php
-if ($this->environment === 'prod') {
-    return sys_get_temp_dir();
+        $kernelContents = file_get_contents($kernelFile);
+
+        $newCode = <<<'EOF'
+
+    public function getCacheDir()
+    {
+        if ($this->environment === 'prod') {
+            return sys_get_temp_dir();
+        }
+        return parent::getCacheDir();
+    }
+
+    public function getLogDir()
+    {
+        if ($this->environment === 'prod') {
+            return sys_get_temp_dir();
+        }
+        return parent::getLogDir();
+    }
 }
-CODE
-);
-
-        $traverser = new NodeTraverser();
-        $traverser->addVisitor(new class($newStmts) extends NodeVisitorAbstract {
-            public function __construct($newStmts)
-            {
-                $this->newStmts = $newStmts;
-            }
-
-            public function enterNode(Node $node)
-            {
-                if ($node instanceof ClassMethod
-                    && in_array($node->name, ['getCacheDir', 'getLogDir'])) {
-                    $node->stmts = array_merge($this->newStmts, $node->stmts);
-                }
-            }
-        });
-
-        $ast = $traverser->traverse($ast);
-        $prettyPrinter = new PrettyPrinter\Standard();
-        file_put_contents($kernelFile, $prettyPrinter->prettyPrintFile($ast));
+EOF;
+
+        $newContents = preg_replace(
+            '/^}$/m',
+            $newCode,
+            $kernelContents,
+            1,
+            $count
+        );
+
+        if ($count != 1) {
+            throw new \UnexpectedValueException(
+                'Failed to update Kernel Cache and Log Dir'
+            );
+        }
+
+        file_put_contents($kernelFile, $newContents);
     }
 
     private static function copyFiles(array $files, $dir)

appengine/php72/symfony-framework/test/DeployTest.php

@@ -65,7 +65,7 @@ public function testLogging()
         $this->eventuallyConsistentRetryCount = 5;
 
         $logging = new LoggingClient([
-            'projectId' => self::getProjectId()
+            'projectId' => self::$projectId
         ]);
 
         $token = uniqid();
@@ -98,7 +98,7 @@ public function testErrorReporting()
     {
         $this->eventuallyConsistentRetryCount = 5;
         $logging = new LoggingClient([
-            'projectId' => self::getProjectId()
+            'projectId' => self::$projectId
         ]);
 
         $token = uniqid();
@@ -123,7 +123,7 @@ public function testErrorReporting()
                     $found = true;
                 }
             }
-            $this->assertTrue($found, 'The log entry was not found');
+            $this->assertTrue($found, 'The error reporting entry was not found');
         });
     }
 }