Move TwigMethod traits out of PSR-4 namespace and instead do the requ…

…ire in symfony-version-compatibility.php
scoutapp · Jul 12, 2021 · a59be64 · a59be64
1 parent 2fbcab4
commit a59be64
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@ All notable changes to this project will be documented in this file, in reverse
 ### Fixed
 
 - [#227](https://github.com/scoutapp/scout-apm-php/pull/227) Fixed "double logging" of SQL queries with new "leafNode" flag on spans
+- [#231](https://github.com/scoutapp/scout-apm-php/pull/231) Fixed how TwigMethods traits are included to work with Composer optimised autoloader properly
 
 ## 6.3.0 - 2021-06-17
 

diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -11,8 +11,8 @@
         <directory name="tests" />
         <ignoreFiles>
             <directory name="vendor" />
-            <file name="src/ScoutApmBundle/Twig/TwigMethods-Twig2.php" />
-            <file name="src/ScoutApmBundle/Twig/TwigMethods-Twig3.php" />
+            <file name="stub/TwigMethods-Twig2.php" />
+            <file name="stub/TwigMethods-Twig3.php" />
             <file name="tests/psalm-stubs.php" />
         </ignoreFiles>
     </projectFiles>

diff --git a/src/ScoutApmBundle/Twig/TwigDecorator.php b/src/ScoutApmBundle/Twig/TwigDecorator.php
@@ -1,8 +1,4 @@
-<?php // phpcs:disable PSR1.Files.SideEffects.FoundWithSymbols
-/**
- * @noinspection PhpInternalEntityUsedInspection
- * @noinspection TransitiveDependenciesUsageInspection
- */
+<?php
 
 declare(strict_types=1);
 
@@ -13,16 +9,6 @@
 use Twig\Environment as Twig;
 use Twig\TemplateWrapper;
 
-/**
- * @psalm-suppress RedundantCondition
- * @psalm-suppress TypeDoesNotContainType
- */
-if (Twig::MAJOR_VERSION === 2) {
-    require_once __DIR__ . '/TwigMethods-Twig2.php';
-} else {
-    require_once __DIR__ . '/TwigMethods-Twig3.php';
-}
-
 class TwigDecorator extends Twig
 {
     use TwigMethods;

diff --git a/src/ScoutApmBundle/symfony-version-compatibility.php b/src/ScoutApmBundle/symfony-version-compatibility.php
@@ -11,3 +11,20 @@ class ControllerEvent extends FilterControllerEvent {
         }
     }
 }
+
+namespace Scoutapm\ScoutApmBundle\Twig
+{
+    use Twig\Environment as Twig;
+
+    if (class_exists(Twig::class)) {
+        /**
+         * @psalm-suppress RedundantCondition
+         * @psalm-suppress TypeDoesNotContainType
+         */
+        if (Twig::MAJOR_VERSION === 2) {
+            require_once __DIR__ . '/../../stub/TwigMethods-Twig2.php';
+        } else {
+            require_once __DIR__ . '/../../stub/TwigMethods-Twig3.php';
+        }
+    }
+}
diff --git a/...ScoutApmBundle/Twig/TwigMethods-Twig2.php → stub/TwigMethods-Twig2.php b/...ScoutApmBundle/Twig/TwigMethods-Twig2.php → stub/TwigMethods-Twig2.php
diff --git a/...ScoutApmBundle/Twig/TwigMethods-Twig3.php → stub/TwigMethods-Twig3.php b/...ScoutApmBundle/Twig/TwigMethods-Twig3.php → stub/TwigMethods-Twig3.php