Merge branch '1.x' into 2.x

* 1.x:
  Update CHANGELOG
  Revert "bug #3499 Fix: A template name cannot be an absolute path (mvorisek)"

CHANGELOG

@@ -351,7 +351,7 @@
 
 # 1.44.4 (2021-XX-XX)
 
- * n/a
+ * Revert "Throw a proper exception when a template name is an absolute path (as it has never been supported)"
 
 # 1.44.3 (2021-05-12)
 

src/Loader/FilesystemLoader.php

@@ -277,10 +277,6 @@ private function validateName($name)
             throw new LoaderError('A template name cannot contain NUL bytes.');
         }
 
-        if ($this->isAbsolutePath($name)) {
-            throw new LoaderError(sprintf('A template name cannot be an absolute path (%s).', $name));
-        }
-
         $name = ltrim($name, '/');
         $parts = explode('/', $name);
         $level = 0;

tests/Loader/FilesystemTest.php

@@ -33,13 +33,11 @@ public function testSecurity($template)
     {
         $loader = new FilesystemLoader([__DIR__.'/../Fixtures']);
 
-        $this->expectException(LoaderError::class);
         try {
             $loader->getCacheKey($template);
+            $this->fail();
         } catch (LoaderError $e) {
             $this->assertStringNotContainsString('Unable to find template', $e->getMessage());
-
-            throw $e;
         }
     }
 
@@ -65,14 +63,6 @@ public function getSecurityTests()
             ['filters\\\\..\\\\..\\\\AutoloaderTest.php'],
             ['filters\\//../\\/\\..\\AutoloaderTest.php'],
             ['/../AutoloaderTest.php'],
-            ['/AutoloaderTest.php'],
-            ['\\AutoloaderTest.php'],
-            ['//AutoloaderTest.php'],
-            ['\\\\AutoloaderTest.php'],
-            ['/./AutoloaderTest.php'],
-            ['\\.\\AutoloaderTest.php'],
-            ['C:/AutoloaderTest.php'],
-            ['C:\\AutoloaderTest.php'],
         ];
     }