Merge 4090c88 into ac8ebb1

cakephp · Mar 27, 2020 · d7569bc · d7569bc
2 parents ac8ebb1 + 4090c88
commit d7569bc
Show file tree

Hide file tree

Showing 35 changed files with 203 additions and 1,162 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -8,12 +8,12 @@ parameters:
         -
             message: "#^Parameter \\#2 \\$callable of class Twig\\\\TwigFilter constructor expects \\(callable\\(\\)\\: mixed\\)\\|null, 'debug' given\\.$#"
             count: 1
-            path: src/Twig/Extension/Basic.php
+            path: src/Twig/Extension/BasicExtension.php
 
         -
             message: "#^Constant ROOT not found\\.$#"
             count: 2
-            path: src/Twig/Extension/Profiler.php
+            path: src/Twig/Extension/ProfilerExtension.php
 
         -
             message: "#^Constant CACHE not found\\.$#"

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,20 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <files psalm-version="3.9.4@352bd3f5c5789db04e4010856c2f4e01ed354f4e">
-  <file src="src/Shell/CompileShell.php">
-    <DeprecatedClass occurrences="3">
-      <code>Shell</code>
-      <code>parent::__construct($io, $locator)</code>
-      <code>parent::getOptionParser()</code>
-    </DeprecatedClass>
-  </file>
-  <file src="src/Twig/TokenParser/Cell.php">
+  <file src="src/Twig/TokenParser/CellParser.php">
     <InternalMethod occurrences="3">
       <code>parseExpression</code>
       <code>parseExpression</code>
       <code>parseExpression</code>
     </InternalMethod>
   </file>
-  <file src="src/Twig/TokenParser/Element.php">
+  <file src="src/Twig/TokenParser/ElementParser.php">
     <InternalMethod occurrences="3">
       <code>parseExpression</code>
       <code>parseExpression</code>

diff --git a/src/Event/ConstructEvent.php b/src/Event/ConstructEvent.php
diff --git a/src/Event/EnvironmentConfigEvent.php b/src/Event/EnvironmentConfigEvent.php
diff --git a/src/Event/ExtensionsListener.php b/src/Event/ExtensionsListener.php
diff --git a/src/Event/LoaderEvent.php b/src/Event/LoaderEvent.php