Merge branch '5.3' into 5.x

contao · May 8, 2024 · 78ed916 · 78ed916
2 parents 9beb068 + 0e9662c
commit 78ed916
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,7 @@
 /vendor/
 
 # Composer bin
-/vendor-bin/*/vendor
+/vendor-bin/*/vendor/
 
 # Monorepo Tools
 /.monorepo-split-cache/

diff --git a/ecs.php b/ecs.php
@@ -56,5 +56,5 @@
     ->withParallel()
     ->withSpacing(Option::INDENTATION_SPACES, "\n")
     ->withConfiguredRule(HeaderCommentFixer::class, ['header' => "This file is part of Contao.\n\n(c) Leo Feyer\n\n@license LGPL-3.0-or-later"])
-    ->withCache(sys_get_temp_dir().'/ecs_cache')
+    ->withCache(sys_get_temp_dir().'/ecs/contao5x')
 ;
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,4 +1,5 @@
 includes:
+    - vendor-bin/phpstan/config/config.php
     - vendor-bin/phpstan/vendor/phpstan/phpstan/conf/bleedingEdge.neon
     - vendor-bin/phpstan/vendor/phpstan/phpstan-phpunit/extension.neon
     - vendor-bin/phpstan/vendor/phpstan/phpstan-phpunit/rules.neon

diff --git a/rector.php b/rector.php
@@ -64,5 +64,5 @@
     ])
     ->withRootFiles()
     ->withParallel()
-    ->withCache(sys_get_temp_dir().'/rector_cache')
+    ->withCache(sys_get_temp_dir().'/rector/contao5x')
 ;
diff --git a/vendor-bin/ecs/config/legacy.php b/vendor-bin/ecs/config/legacy.php
@@ -119,5 +119,5 @@
     ->withConfiguredRule(HeaderCommentFixer::class, ['header' => "This file is part of Contao.\n\n(c) Leo Feyer\n\n@license LGPL-3.0-or-later"])
     ->withConfiguredRule(ListSyntaxFixer::class, ['syntax' => 'long'])
     ->withConfiguredRule(NoExtraBlankLinesFixer::class, ['tokens' => ['curly_brace_block', 'extra', 'parenthesis_brace_block', 'square_brace_block', 'use']])
-    ->withCache(sys_get_temp_dir().'/ecs_legacy_cache')
+    ->withCache(sys_get_temp_dir().'/ecs/contao5x-legacy')
 ;
diff --git a/vendor-bin/ecs/config/template.php b/vendor-bin/ecs/config/template.php
@@ -56,5 +56,5 @@
     ->withParallel()
     ->withSpacing(Option::INDENTATION_SPACES, "\n")
     ->withFileExtensions(['html5'])
-    ->withCache(sys_get_temp_dir().'/ecs_template_cache')
+    ->withCache(sys_get_temp_dir().'/ecs/contao5x-template')
 ;
diff --git a/vendor-bin/phpstan/config/config.php b/vendor-bin/phpstan/config/config.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of Contao.
+ *
+ * (c) Leo Feyer
+ *
+ * @license LGPL-3.0-or-later
+ */
+
+return [
+    'parameters' => [
+        'tmpDir' => sys_get_temp_dir().'/phpstan/contao5x',
+    ],
+];
diff --git a/vendor-bin/phpstan/src/ExtensionReturnTypeExtension.php b/vendor-bin/phpstan/src/ExtensionReturnTypeExtension.php
@@ -2,6 +2,14 @@
 
 declare(strict_types=1);
 
+/*
+ * This file is part of Contao.
+ *
+ * (c) Leo Feyer
+ *
+ * @license LGPL-3.0-or-later
+ */
+
 namespace Contao\Tools\PHPStan;
 
 use PhpParser\Node\Expr\MethodCall;

diff --git a/vendor-bin/phpstan/src/GraphReturnTypeExtension.php b/vendor-bin/phpstan/src/GraphReturnTypeExtension.php
@@ -2,6 +2,14 @@
 
 declare(strict_types=1);
 
+/*
+ * This file is part of Contao.
+ *
+ * (c) Leo Feyer
+ *
+ * @license LGPL-3.0-or-later
+ */
+
 namespace Contao\Tools\PHPStan;
 
 use PhpParser\Node\Expr\MethodCall;

diff --git a/vendor-bin/phpstan/src/HelperReturnTypeExtension.php b/vendor-bin/phpstan/src/HelperReturnTypeExtension.php
@@ -2,6 +2,14 @@
 
 declare(strict_types=1);
 
+/*
+ * This file is part of Contao.
+ *
+ * (c) Leo Feyer
+ *
+ * @license LGPL-3.0-or-later
+ */
+
 namespace Contao\Tools\PHPStan;
 
 use PhpParser\Node\Expr\MethodCall;