Merge branch '8.x' into 9.x

Author: crynobone

tests/Functions/PackagePathTest.php

@@ -26,22 +26,22 @@ public function it_can_resolve_correct_package_path(string $path)
     {
         $this->assertSame(
             realpath(join_paths(__DIR__, 'PackagePathTest.php')),
-            package_path(join_paths('./tests', 'Helpers', 'PackagePathTest.php'))
+            package_path(join_paths('./tests', 'Functions', 'PackagePathTest.php'))
         );
 
         $this->assertSame(
             realpath(join_paths(__DIR__, 'PackagePathTest.php')),
-            package_path(join_paths('tests', 'Helpers', 'PackagePathTest.php'))
+            package_path(join_paths('tests', 'Functions', 'PackagePathTest.php'))
         );
 
         $this->assertSame(
             realpath(join_paths(__DIR__, 'PackagePathTest.php')),
-            package_path(DIRECTORY_SEPARATOR.join_paths('tests', 'Helpers', 'PackagePathTest.php'))
+            package_path(DIRECTORY_SEPARATOR.join_paths('tests', 'Functions', 'PackagePathTest.php'))
         );
 
         $this->assertSame(
             realpath(join_paths(__DIR__, 'PackagePathTest.php')),
-            package_path(join_paths('tests', 'Helpers', 'PackagePathTest.php'))
+            package_path(join_paths('tests', 'Functions', 'PackagePathTest.php'))
         );
     }